Release 1.214.0 (#1465 )

Bugfix/fix dynamic decimal places for cryptocurrencies in position detail dialog (#1464 )
* Fix dynamic decimal places * Update changelog
2022-11-19 12:15:22 +01:00 · 2022-11-19 12:13:02 +01:00 · 2022-11-19 11:28:26 +01:00 · 2022-11-19 10:19:01 +01:00 · 2022-11-19 10:06:05 +01:00 · 2022-11-19 10:02:36 +01:00
223 changed files with 18220 additions and 6961 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,37 +1,45 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: "[BUG]"
+title: '[BUG]'
 labels: ''
 assignees: ''
-
 ---

 The Issue tracker is **ONLY** used for reporting bugs. New features should be discussed on our [Slack channel](https://ghostfolio.slack.com) or in [Discussions](https://github.com/ghostfolio/ghostfolio/discussions).

-**Describe the bug**
+**Bug Description**
+
 <!-- A clear and concise description of what the bug is. -->

 **To Reproduce**
-Steps to reproduce the behavior:
+
+<!-- Steps to reproduce the behavior -->
+
 1.
 2.
 3.
-4.

 **Expected behavior**
+
 <!-- A clear and concise description of what you expected to happen. -->

 **Screenshots**
+
 <!-- If applicable, add screenshots to help explain your problem. -->

 **Logs**
+
 <!-- If applicable, add logs to help explain your problem. -->

-**Environment (please complete the following information):**
- - Ghostfolio Version [e.g. 1.194.0]
- - Browser [e.g. chrome]
- - OS
+**Environment**
+
+<!-- Please complete the following information -->
+
+- Ghostfolio Version X.Y.Z
+- Browser
+- OS

 **Additional context**
+
 <!-- Add any other context about the problem here. -->
--- a/.prettierrc
+++ b/.prettierrc
@ -1,4 +1,13 @@
 {
+  "attributeGroups": [
+    "$ANGULAR_ELEMENT_REF",
+    "$ANGULAR_STRUCTURAL_DIRECTIVE",
+    "$DEFAULT",
+    "$ANGULAR_INPUT",
+    "$ANGULAR_TWO_WAY_BINDING",
+    "$ANGULAR_OUTPUT"
+  ],
+  "attributeSort": "ASC",
  "endOfLine": "auto",
  "printWidth": 80,
  "singleQuote": true,
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -5,11 +5,11 @@
      "name": "Debug Jest File",
      "type": "node",
      "request": "launch",
-      "program": "${workspaceFolder}/node_modules/@angular/cli/bin/ng",
+      "program": "${workspaceFolder}/node_modules/@nrwl/cli/bin/nx",
      "args": [
        "test",
        "--codeCoverage=false",
-        "--testFile=${workspaceFolder}/apps/api/src/models/portfolio.spec.ts"
+        "--testFile=${workspaceFolder}/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts"
      ],
      "cwd": "${workspaceFolder}",
      "console": "internalConsole"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,243 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## 1.214.0 - 19.11.2022
+
+### Added
+
+- Added support for sorting in the accounts table
+
+### Changed
+
+- Improved the support for the `MANUAL` data source
+- Improved the _Activities_ tab icon
+- Improved the _Activities_ icons for `BUY`, `DIVIDEND` and `SELL`
+- Upgraded `prisma` from version `4.4.0` to `4.6.1`
+- Upgraded `yahoo-finance2` from version `2.3.6` to `2.3.10`
+
+### Fixed
+
+- Fixed the activities sorting in the position detail dialog
+- Fixed the dynamic number of decimal places for cryptocurrencies in the position detail dialog
+- Fixed a division by zero error in the cash positions calculation
+
+## 1.213.0 - 14.11.2022
+
+### Added
+
+- Added an indicator for excluded accounts in the accounts table
+- Added a blog post: _Black Friday 2022_
+
+## 1.212.0 - 11.11.2022
+
+### Changed
+
+- Changed the view mode selector to a slide toggle
+- Upgraded `Nx` from version `15.0.0` to `15.0.13`
+
+## 1.211.0 - 11.11.2022
+
+### Changed
+
+- Converted the client into a _Progressive Web App_ (PWA) with `@angular/pwa`
+- Removed the bottom margin from the body element
+- Improved the pricing page
+
+## 1.210.0 - 08.11.2022
+
+### Added
+
+- Added tabs to the portfolio page
+
+### Changed
+
+- Merged the _FIRE_ calculator and the _X-ray_ section to a single page
+- Tightened the validation rule of the base currency environment variable (`BASE_CURRENCY`)
+
+### Fixed
+
+- Fixed an issue in the cash positions calculation
+
+## 1.209.0 - 05.11.2022
+
+### Added
+
+- Added the _Buy me a coffee_ button to the about page
+
+### Changed
+
+- Improved the usability of the activities import
+- Improved the usage of the premium indicator component
+- Removed the intro image in dark mode
+- Refactored the `TransactionsPageComponent` to `ActivitiesPageComponent`
+
+## 1.208.0 - 03.11.2022
+
+### Added
+
+- Added pagination to the activities table
+
+### Changed
+
+- Restructured the actions in the admin control panel
+
+### Fixed
+
+- Fixed the calculation in the portfolio evolution chart
+
+## 1.207.0 - 31.10.2022
+
+### Added
+
+- Added support for translated labels of asset and asset sub class
+- Added support for dates in _ISO 8601_ date format (`YYYY-MM-DD`) in the activities import
+
+### Changed
+
+- Darkened the background color of the dark mode
+
+### Fixed
+
+- Fixed the public page
+- Improved the loading indicator of the portfolio evolution chart
+
+## 1.206.2 - 20.10.2022
+
+### Changed
+
+- Fixed the `rxjs` version to `7.5.6` (resolutions)
+- Migrated the `angular.json` to `project.json` files in the `Nx` workspace
+- Upgraded `nestjs` from version `9.0.7` to `9.1.4`
+- Upgraded `Nx` from version `14.6.4` to `15.0.0`
+
+### Fixed
+
+- Fixed the performance calculation including `SELL` activities with a significant performance gain
+
+## 1.205.2 - 16.10.2022
+
+### Changed
+
+- Persisted the language on url change
+- Improved the portfolio evolution chart
+- Refactored the appearance (dark mode) in user settings (from `appearance` to `colorScheme`)
+- Improved the wording on the landing page
+
+## 1.204.1 - 15.10.2022
+
+### Added
+
+- Added support to change the appearance (dark mode) in user settings
+- Added the total amount chart to the investment timeline
+- Setup the `prettier` plugin `prettier-plugin-organize-attributes`
+
+### Changed
+
+- Respected the current date in the _FIRE_ calculator
+- Simplified the settings management in the admin control panel
+- Renamed the data source type `RAKUTEN` to `RAPID_API`
+
+### Fixed
+
+- Fixed some links in the blog posts
+- Fixed the alignment of the value component on the allocations page
+
+### Todo
+
+- Rename the environment variable from `RAKUTEN_RAPID_API_KEY` to `RAPID_API_API_KEY`
+
+## 1.203.0 - 08.10.2022
+
+### Added
+
+- Supported a progressive line animation in the line chart component
+
+### Changed
+
+- Moved the benchmark comparator from experimental to general availability
+- Improved the user interface of the benchmark comparator
+
+### Fixed
+
+- Fixed an issue in the performance and chart calculation of today
+- Fixed the alignment of the value component in the admin control panel
+
+## 1.202.0 - 07.10.2022
+
+### Added
+
+- Added support for a translated 4% rule in the _FIRE_ section
+
+### Changed
+
+- Improved the caching of the benchmarks in the markets overview (only cache if fetching was successful)
+- Improved the wording in the twitter bot service
+
+### Fixed
+
+- Fixed the support for cryptocurrencies having a symbol with less than 3 characters (e.g. `SC-USD`)
+- Fixed the text truncation in the value component
+
+## 1.201.0 - 01.10.2022
+
+### Added
+
+- Added a blog post: _Hacktoberfest 2022_
+
+### Changed
+
+- Improved the usage of the value component in the admin control panel
+- Improved the language localization for Español (`es`)
+
+### Fixed
+
+- Fixed the usage of the value component on the allocations page
+
+## 1.200.0 - 01.10.2022
+
+### Added
+
+- Added a mini statistics section to the landing page including pulls on _Docker Hub_
+- Added an _As seen in_ section to the landing page
+- Added support for an icon in the value component
+
+### Changed
+
+- Upgraded `prisma` from version `4.1.1` to `4.4.0`
+
+## 1.199.1 - 27.09.2022
+
+### Added
+
+- Set up the language localization for Español (`es`)
+- Added support for sectors in mutual funds
+
+## 1.198.0 - 25.09.2022
+
+### Added
+
+- Added support to exclude an account from analysis
+- Set up the language localization for Nederlands (`nl`)
+
+## 1.197.0 - 24.09.2022
+
+### Added
+
+- Added the value of the active filter in percentage on the allocations page
+- Extended the feature overview page by multi-language support (English, German, Italian)
+
+### Changed
+
+- Combined the performance and chart calculation
+- Improved the style of various selectors (density)
+
+## 1.196.0 - 22.09.2022
+
+### Added
+
+- Set up the language localization for Italiano (`it`)
+- Extended the landing page
+
 ## 1.195.0 - 20.09.2022

 ### Changed
@ -195,7 +432,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added

 - Set up `ng-extract-i18n-merge` to improve the i18n extraction and merge workflow
- Set up language localization for German (`de`)
+- Set up the language localization for German (`de`)
 - Resolved the feature graphic of the blog post

 ### Changed
@ -857,8 +1094,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Changed

- Display the value in base currency in the accounts table on mobile
- Display the value in base currency in the activities table on mobile
+- Displayed the value in base currency in the accounts table on mobile
+- Displayed the value in base currency in the activities table on mobile
 - Renamed `orders` to `activities` in import and export functionality
 - Harmonized the algebraic sign of `currentGrossPerformancePercent` and `currentNetPerformancePercent` with `currentGrossPerformance` and `currentNetPerformance`
 - Improved the pricing page
--- a/1
+++ b/1
@ -25,7 +25,6 @@ RUN yarn install
 COPY ./decorate-angular-cli.js decorate-angular-cli.js
 RUN node decorate-angular-cli.js

-COPY ./angular.json angular.json
 COPY ./nx.json nx.json
 COPY ./replace.build.js replace.build.js
 COPY ./jest.preset.js jest.preset.js
--- a/README.md
+++ b/README.md
@ -53,13 +53,13 @@ Ghostfolio is for you if you are...

 - ✅ Create, update and delete transactions
 - ✅ Multi account management
- ✅ Portfolio performance: Time-weighted rate of return (TWR) for `Today`, `YTD`, `1Y`, `5Y`, `Max`
+- ✅ Portfolio performance for `Today`, `YTD`, `1Y`, `5Y`, `Max`
 - ✅ Various charts
 - ✅ Static analysis to identify potential risks in your portfolio
 - ✅ Import and export transactions
 - ✅ Dark Mode
 - ✅ Zen Mode
- ✅ Mobile-first design
+- ✅ Progressive Web App (PWA) with a mobile-first design

 <div align="center" style="margin-top: 1rem; margin-bottom: 1rem;">
  <img src="./apps/client/src/assets/images/screenshot.png" width="300">
@ -81,22 +81,32 @@ The frontend is built with [Angular](https://angular.io) and uses [Angular Mater

 We provide official container images hosted on [Docker Hub](https://hub.docker.com/r/ghostfolio/ghostfolio) for `linux/amd64` and `linux/arm64`.

+<div align="center">
+  <a href="https://www.buymeacoffee.com/ghostfolio">
+    <img
+      alt="Buy me a coffee button"
+      src="./apps/client/src/assets/images/button-buy-me-a-coffee.png"
+      width="150"
+    />
+  </a>
+</div>
+
 ### Supported Environment Variables

-| Name                | Default Value | Description                                                                                                                         |
-| ------------------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `ACCESS_TOKEN_SALT` |               | A random string used as salt for access tokens                                                                                      |
-| `BASE_CURRENCY`     | `USD`         | The base currency of the Ghostfolio application. Caution: This cannot be changed later!                                             |
-| `DATABASE_URL`      |               | The database connection URL, e.g. `postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer` |
-| `HOST`              | `0.0.0.0`     | The host where the Ghostfolio application will run on                                                                               |
-| `JWT_SECRET_KEY`    |               | A random string used for _JSON Web Tokens_ (JWT)                                                                                    |
-| `PORT`              | `3333`        | The port where the Ghostfolio application will run on                                                                               |
-| `POSTGRES_DB`       |               | The name of the _PostgreSQL_ database                                                                                               |
-| `POSTGRES_PASSWORD` |               | The password of the _PostgreSQL_ database                                                                                           |
-| `POSTGRES_USER`     |               | The user of the _PostgreSQL_ database                                                                                               |
-| `REDIS_HOST`        |               | The host where _Redis_ is running                                                                                                   |
-| `REDIS_PASSWORD`    |               | The password of _Redis_                                                                                                             |
-| `REDIS_PORT`        |               | The port where _Redis_ is running                                                                                                   |
+| Name                | Default Value | Description                                                                                                                                                                                                                                      |
+| ------------------- | ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `ACCESS_TOKEN_SALT` |               | A random string used as salt for access tokens                                                                                                                                                                                                   |
+| `BASE_CURRENCY`     | `USD`         | The base currency of the Ghostfolio application.<br />`AUD` \| `CAD` \| `CNY` \| `EUR` \| `GBP` \| `JPY` \| `RUB` \| `USD`<br />Caution: Only set if you intend to track cryptocurrencies in a non-`USD` currency. This cannot be changed later! |
+| `DATABASE_URL`      |               | The database connection URL, e.g. `postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer`                                                                                                              |
+| `HOST`              | `0.0.0.0`     | The host where the Ghostfolio application will run on                                                                                                                                                                                            |
+| `JWT_SECRET_KEY`    |               | A random string used for _JSON Web Tokens_ (JWT)                                                                                                                                                                                                 |
+| `PORT`              | `3333`        | The port where the Ghostfolio application will run on                                                                                                                                                                                            |
+| `POSTGRES_DB`       |               | The name of the _PostgreSQL_ database                                                                                                                                                                                                            |
+| `POSTGRES_PASSWORD` |               | The password of the _PostgreSQL_ database                                                                                                                                                                                                        |
+| `POSTGRES_USER`     |               | The user of the _PostgreSQL_ database                                                                                                                                                                                                            |
+| `REDIS_HOST`        |               | The host where _Redis_ is running                                                                                                                                                                                                                |
+| `REDIS_PASSWORD`    |               | The password of _Redis_                                                                                                                                                                                                                          |
+| `REDIS_PORT`        |               | The port where _Redis_ is running                                                                                                                                                                                                                |

 ### Run with Docker Compose

@ -128,7 +138,7 @@ docker-compose --env-file ./.env -f docker/docker-compose.build.yml up -d
 Open http://localhost:3333 in your browser and accomplish these steps:

 1. Create a new user via _Get Started_ (this first user will get the role `ADMIN`)
-1. Go to the _Admin Control Panel_ and click _Gather All Data_ to fetch historical data
+1. Go to the _Market Data_ tab in the _Admin Control Panel_ and click _Gather All Data_ to fetch historical data
 1. Click _Sign out_ and check out the _Live Demo_

 #### Upgrade Version
@ -158,7 +168,7 @@ Please follow the instructions of the Ghostfolio [Unraid Community App](https://
 1. Run `yarn database:setup` to initialize the database schema and populate your database with (example) data
 1. Start the server and the client (see [_Development_](#Development))
 1. Create a new user via _Get Started_ (this first user will get the role `ADMIN`)
-1. Go to the _Admin Control Panel_ and click _Gather All Data_ to fetch historical data
+1. Go to the _Market Data_ tab in the _Admin Control Panel_ and click _Gather All Data_ to fetch historical data
 1. Click _Sign out_ and check out the _Live Demo_

 ### Start Server
@ -190,20 +200,22 @@ Run `yarn test`

 ## Public API

+### Authorization: Bearer Token
+
+Set the header for each request as follows:
+
+```
+"Authorization": "Bearer eyJh..."
+```
+
+You can get the _Bearer Token_ via `GET http://localhost:3333/api/v1/auth/anonymous/<INSERT_SECURITY_TOKEN_OF_ACCOUNT>` or `curl -s http://localhost:3333/api/v1/auth/anonymous/<INSERT_SECURITY_TOKEN_OF_ACCOUNT>`.
+
 ### Import Activities

 #### Request

 `POST http://localhost:3333/api/v1/import`

-#### Authorization: Bearer Token
-
-Set the header as follows:
-
-```
-"Authorization": "Bearer eyJh..."
-```
-
 #### Body

 ```
@ -215,7 +227,7 @@ Set the header as follows:
      "date": "2021-09-15T00:00:00.000Z",
      "fee": 19,
      "quantity": 5,
-      "symbol": "MSFT"
+      "symbol": "MSFT",
      "type": "BUY",
      "unitPrice": 298.58
    }
@ -254,6 +266,10 @@ Set the header as follows:
 }
 ```

+## Community Projects
+
+- [ghostfolio-cli](https://github.com/DerAndereJohannes/ghostfolio-cli): Command-line interface to access your portfolio
+
 ## Contributing

 Ghostfolio is **100% free** and **open source**. We encourage and support an active and healthy community that accepts contributions from the public - including you.
--- a/angular.json
+++ b/angular.json
@ -1,368 +0,0 @@
-{
-  "version": 1,
-  "projects": {
-    "api": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "root": "apps/api",
-      "sourceRoot": "apps/api/src",
-      "projectType": "application",
-      "prefix": "api",
-      "schematics": {},
-      "architect": {
-        "build": {
-          "builder": "@nrwl/node:webpack",
-          "options": {
-            "outputPath": "dist/apps/api",
-            "main": "apps/api/src/main.ts",
-            "tsConfig": "apps/api/tsconfig.app.json",
-            "assets": ["apps/api/src/assets"]
-          },
-          "configurations": {
-            "production": {
-              "generatePackageJson": true,
-              "optimization": true,
-              "extractLicenses": true,
-              "inspect": false,
-              "fileReplacements": [
-                {
-                  "replace": "apps/api/src/environments/environment.ts",
-                  "with": "apps/api/src/environments/environment.prod.ts"
-                }
-              ]
-            }
-          },
-          "outputs": ["{options.outputPath}"]
-        },
-        "serve": {
-          "builder": "@nrwl/node:node",
-          "options": {
-            "buildTarget": "api:build"
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["apps/api/**/*.ts"]
-          }
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "options": {
-            "jestConfig": "apps/api/jest.config.ts",
-            "passWithNoTests": true
-          },
-          "outputs": ["coverage/apps/api"]
-        }
-      },
-      "tags": []
-    },
-    "client": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "application",
-      "schematics": {
-        "@schematics/angular:component": {
-          "style": "scss"
-        }
-      },
-      "root": "apps/client",
-      "sourceRoot": "apps/client/src",
-      "prefix": "gf",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
-          "options": {
-            "outputPath": "dist/apps/client",
-            "index": "apps/client/src/index.html",
-            "main": "apps/client/src/main.ts",
-            "polyfills": "apps/client/src/polyfills.ts",
-            "tsConfig": "apps/client/tsconfig.app.json",
-            "assets": [
-              {
-                "glob": "assetlinks.json",
-                "input": "apps/client/src/assets",
-                "output": "./../.well-known"
-              },
-              {
-                "glob": "CHANGELOG.md",
-                "input": "",
-                "output": "./../assets"
-              },
-              {
-                "glob": "LICENSE",
-                "input": "",
-                "output": "./../assets"
-              },
-              {
-                "glob": "robots.txt",
-                "input": "apps/client/src/assets",
-                "output": "./../"
-              },
-              {
-                "glob": "sitemap.xml",
-                "input": "apps/client/src/assets",
-                "output": "./../"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/ionicons/dist/ionicons",
-                "output": "./../ionicons"
-              },
-              {
-                "glob": "**/*.js",
-                "input": "node_modules/ionicons/dist/",
-                "output": "./../"
-              },
-              {
-                "glob": "**/*",
-                "input": "apps/client/src/assets",
-                "output": "./../assets/"
-              }
-            ],
-            "styles": ["apps/client/src/styles.scss"],
-            "scripts": ["node_modules/marked/marked.min.js"],
-            "vendorChunk": true,
-            "extractLicenses": false,
-            "buildOptimizer": false,
-            "sourceMap": true,
-            "optimization": false,
-            "namedChunks": true
-          },
-          "configurations": {
-            "development-de": {
-              "baseHref": "/de/",
-              "localize": ["de"]
-            },
-            "development-en": {
-              "baseHref": "/en/",
-              "localize": ["en"]
-            },
-            "development-it": {
-              "baseHref": "/it/",
-              "localize": ["it"]
-            },
-            "production": {
-              "fileReplacements": [
-                {
-                  "replace": "apps/client/src/environments/environment.ts",
-                  "with": "apps/client/src/environments/environment.prod.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "namedChunks": false,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "6kb",
-                  "maximumError": "10kb"
-                }
-              ]
-            }
-          },
-          "outputs": ["{options.outputPath}"],
-          "defaultConfiguration": ""
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "client:build",
-            "proxyConfig": "apps/client/proxy.conf.json"
-          },
-          "configurations": {
-            "development-de": {
-              "browserTarget": "client:build:development-de"
-            },
-            "development-en": {
-              "browserTarget": "client:build:development-en"
-            },
-            "development-it": {
-              "browserTarget": "client:build:development-it"
-            },
-            "production": {
-              "browserTarget": "client:build:production"
-            }
-          }
-        },
-        "extract-i18n": {
-          "builder": "ng-extract-i18n-merge:ng-extract-i18n-merge",
-          "options": {
-            "browserTarget": "client:build",
-            "includeContext": true,
-            "outputPath": "src/locales",
-            "targetFiles": ["messages.de.xlf", "messages.it.xlf"]
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["apps/client/**/*.ts"]
-          }
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "options": {
-            "jestConfig": "apps/client/jest.config.ts",
-            "passWithNoTests": true
-          },
-          "outputs": ["coverage/apps/client"]
-        }
-      },
-      "i18n": {
-        "locales": {
-          "de": {
-            "baseHref": "/de/",
-            "translation": "apps/client/src/locales/messages.de.xlf"
-          },
-          "it": {
-            "baseHref": "/it/",
-            "translation": "apps/client/src/locales/messages.it.xlf"
-          }
-        },
-        "sourceLocale": "en"
-      },
-      "tags": []
-    },
-    "client-e2e": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "root": "apps/client-e2e",
-      "sourceRoot": "apps/client-e2e/src",
-      "projectType": "application",
-      "architect": {
-        "e2e": {
-          "builder": "@nrwl/cypress:cypress",
-          "options": {
-            "cypressConfig": "apps/client-e2e/cypress.json",
-            "tsConfig": "apps/client-e2e/tsconfig.e2e.json",
-            "devServerTarget": "client:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "client:serve:production"
-            }
-          }
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["client"]
-    },
-    "common": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "root": "libs/common",
-      "sourceRoot": "libs/common/src",
-      "projectType": "library",
-      "architect": {
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["libs/common/**/*.ts"]
-          }
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["coverage/libs/common"],
-          "options": {
-            "jestConfig": "libs/common/jest.config.ts",
-            "passWithNoTests": true
-          }
-        }
-      },
-      "tags": []
-    },
-    "ui": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "schematics": {
-        "@schematics/angular:component": {
-          "style": "scss"
-        }
-      },
-      "root": "libs/ui",
-      "sourceRoot": "libs/ui/src",
-      "prefix": "gf",
-      "architect": {
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["coverage/libs/ui"],
-          "options": {
-            "jestConfig": "libs/ui/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["libs/ui/src/**/*.ts", "libs/ui/src/**/*.html"]
-          }
-        },
-        "storybook": {
-          "builder": "@storybook/angular:start-storybook",
-          "options": {
-            "port": 4400,
-            "configDir": "libs/ui/.storybook",
-            "browserTarget": "ui:build-storybook",
-            "compodoc": false
-          },
-          "configurations": {
-            "ci": {
-              "quiet": true
-            }
-          }
-        },
-        "build-storybook": {
-          "builder": "@storybook/angular:build-storybook",
-          "outputs": ["{options.outputPath}"],
-          "options": {
-            "outputDir": "dist/storybook/ui",
-            "configDir": "libs/ui/.storybook",
-            "browserTarget": "ui:build-storybook",
-            "compodoc": false
-          },
-          "configurations": {
-            "ci": {
-              "quiet": true
-            }
-          }
-        }
-      },
-      "tags": []
-    },
-    "ui-e2e": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "root": "apps/ui-e2e",
-      "sourceRoot": "apps/ui-e2e/src",
-      "projectType": "application",
-      "architect": {
-        "e2e": {
-          "builder": "@nrwl/cypress:cypress",
-          "options": {
-            "cypressConfig": "apps/ui-e2e/cypress.json",
-            "devServerTarget": "ui:storybook",
-            "tsConfig": "apps/ui-e2e/tsconfig.json"
-          },
-          "configurations": {
-            "ci": {
-              "devServerTarget": "ui:storybook:ci"
-            }
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["apps/ui-e2e/**/*.{js,ts}"]
-          }
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["ui"]
-    }
-  }
-}
--- a/apps/api/project.json
+++ b/apps/api/project.json
@ -0,0 +1,57 @@
+{
+  "name": "api",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "apps/api/src",
+  "projectType": "application",
+  "prefix": "api",
+  "generators": {},
+  "targets": {
+    "build": {
+      "executor": "@nrwl/webpack:webpack",
+      "options": {
+        "outputPath": "dist/apps/api",
+        "main": "apps/api/src/main.ts",
+        "tsConfig": "apps/api/tsconfig.app.json",
+        "assets": ["apps/api/src/assets"],
+        "target": "node",
+        "compiler": "tsc"
+      },
+      "configurations": {
+        "production": {
+          "generatePackageJson": true,
+          "optimization": true,
+          "extractLicenses": true,
+          "inspect": false,
+          "fileReplacements": [
+            {
+              "replace": "apps/api/src/environments/environment.ts",
+              "with": "apps/api/src/environments/environment.prod.ts"
+            }
+          ]
+        }
+      },
+      "outputs": ["{options.outputPath}"]
+    },
+    "serve": {
+      "executor": "@nrwl/node:node",
+      "options": {
+        "buildTarget": "api:build"
+      }
+    },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "options": {
+        "lintFilePatterns": ["apps/api/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "@nrwl/jest:jest",
+      "options": {
+        "jestConfig": "apps/api/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "outputs": ["{workspaceRoot}/coverage/apps/api"]
+    }
+  },
+  "tags": []
+}
--- a/apps/api/src/app/account/account.controller.ts
+++ b/apps/api/src/app/account/account.controller.ts
@ -95,9 +95,10 @@ export class AccountController {
      );

    let accountsWithAggregations =
-      await this.portfolioService.getAccountsWithAggregations(
-        impersonationUserId || this.request.user.id
-      );
+      await this.portfolioService.getAccountsWithAggregations({
+        userId: impersonationUserId || this.request.user.id,
+        withExcludedAccounts: true
+      });

    if (
      impersonationUserId ||
@ -137,10 +138,11 @@ export class AccountController {
      );

    let accountsWithAggregations =
-      await this.portfolioService.getAccountsWithAggregations(
-        impersonationUserId || this.request.user.id,
-        [{ id, type: 'ACCOUNT' }]
-      );
+      await this.portfolioService.getAccountsWithAggregations({
+        filters: [{ id, type: 'ACCOUNT' }],
+        userId: impersonationUserId || this.request.user.id,
+        withExcludedAccounts: true
+      });

    if (
      impersonationUserId ||
--- a/apps/api/src/app/account/account.service.ts
+++ b/apps/api/src/app/account/account.service.ts
@ -107,15 +107,23 @@ export class AccountService {
  public async getCashDetails({
    currency,
    filters = [],
-    userId
+    userId,
+    withExcludedAccounts = false
  }: {
    currency: string;
    filters?: Filter[];
    userId: string;
+    withExcludedAccounts?: boolean;
  }): Promise<CashDetails> {
    let totalCashBalanceInBaseCurrency = new Big(0);

-    const where: Prisma.AccountWhereInput = { userId };
+    const where: Prisma.AccountWhereInput = {
+      userId
+    };
+
+    if (withExcludedAccounts === false) {
+      where.isExcluded = false;
+    }

    const {
      ACCOUNT: filtersByAccount,
--- a/apps/api/src/app/account/create-account.dto.ts
+++ b/apps/api/src/app/account/create-account.dto.ts
@ -1,5 +1,11 @@
 import { AccountType } from '@prisma/client';
-import { IsNumber, IsString, ValidateIf } from 'class-validator';
+import {
+  IsBoolean,
+  IsNumber,
+  IsOptional,
+  IsString,
+  ValidateIf
+} from 'class-validator';

 export class CreateAccountDto {
  @IsString()
@ -11,6 +17,10 @@ export class CreateAccountDto {
  @IsString()
  currency: string;

+  @IsBoolean()
+  @IsOptional()
+  isExcluded?: boolean;
+
  @IsString()
  name: string;

--- a/apps/api/src/app/account/update-account.dto.ts
+++ b/apps/api/src/app/account/update-account.dto.ts
@ -1,5 +1,11 @@
 import { AccountType } from '@prisma/client';
-import { IsNumber, IsString, ValidateIf } from 'class-validator';
+import {
+  IsBoolean,
+  IsNumber,
+  IsOptional,
+  IsString,
+  ValidateIf
+} from 'class-validator';

 export class UpdateAccountDto {
  @IsString()
@ -14,6 +20,10 @@ export class UpdateAccountDto {
  @IsString()
  id: string;

+  @IsBoolean()
+  @IsOptional()
+  isExcluded?: boolean;
+
  @IsString()
  name: string;

--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@ -181,10 +181,10 @@ export class AdminService {
  public async putSetting(key: string, value: string) {
    let response: Property;

-    if (value === '') {
-      response = await this.propertyService.delete({ key });
-    } else {
+    if (value) {
      response = await this.propertyService.put({ key, value });
+    } else {
+      response = await this.propertyService.delete({ key });
    }

    if (key === PROPERTY_CURRENCIES) {
--- a/apps/api/src/app/benchmark/benchmark.service.ts
+++ b/apps/api/src/app/benchmark/benchmark.service.ts
@ -73,6 +73,7 @@ export class BenchmarkService {
    }

    const allTimeHighs = await Promise.all(promises);
+    let storeInCache = true;

    benchmarks = allTimeHighs.map((allTimeHigh, index) => {
      const { marketPrice } =
@ -85,6 +86,8 @@ export class BenchmarkService {
          allTimeHigh,
          marketPrice
        );
+      } else {
+        storeInCache = false;
      }

      return {
@ -100,11 +103,13 @@ export class BenchmarkService {
      };
    });

-    await this.redisCacheService.set(
-      this.CACHE_KEY_BENCHMARKS,
-      JSON.stringify(benchmarks),
-      ms('4 hours') / 1000
-    );
+    if (storeInCache) {
+      await this.redisCacheService.set(
+        this.CACHE_KEY_BENCHMARKS,
+        JSON.stringify(benchmarks),
+        ms('4 hours') / 1000
+      );
+    }

    return benchmarks;
  }
@ -164,7 +169,7 @@ export class BenchmarkService {
    );

    const marketPriceAtStartDate = marketDataItems?.[0]?.marketPrice ?? 0;
-    return {
+    const response = {
      marketData: [
        ...marketDataItems
          .filter((marketDataItem, index) => {
@ -181,17 +186,22 @@ export class BenchmarkService {
                      marketDataItem.marketPrice
                    ) * 100
            };
-          }),
-        {
-          date: format(new Date(), DATE_FORMAT),
-          value:
-            this.calculateChangeInPercentage(
-              marketPriceAtStartDate,
-              currentSymbolItem.marketPrice
-            ) * 100
-        }
+          })
      ]
    };
+
+    if (currentSymbolItem?.marketPrice) {
+      response.marketData.push({
+        date: format(new Date(), DATE_FORMAT),
+        value:
+          this.calculateChangeInPercentage(
+            marketPriceAtStartDate,
+            currentSymbolItem.marketPrice
+          ) * 100
+      });
+    }
+
+    return response;
  }

  private getMarketCondition(aPerformanceInPercent: number) {
--- a/apps/api/src/app/frontend.middleware.ts
+++ b/apps/api/src/app/frontend.middleware.ts
@ -11,6 +11,9 @@ import { NextFunction, Request, Response } from 'express';
 export class FrontendMiddleware implements NestMiddleware {
  public indexHtmlDe = '';
  public indexHtmlEn = '';
+  public indexHtmlEs = '';
+  public indexHtmlIt = '';
+  public indexHtmlNl = '';
  public isProduction: boolean;

  public constructor(
@ -32,17 +35,30 @@ export class FrontendMiddleware implements NestMiddleware {
        this.getPathOfIndexHtmlFile(DEFAULT_LANGUAGE_CODE),
        'utf8'
      );
+      this.indexHtmlEs = fs.readFileSync(
+        this.getPathOfIndexHtmlFile('es'),
+        'utf8'
+      );
+      this.indexHtmlIt = fs.readFileSync(
+        this.getPathOfIndexHtmlFile('it'),
+        'utf8'
+      );
+      this.indexHtmlNl = fs.readFileSync(
+        this.getPathOfIndexHtmlFile('nl'),
+        'utf8'
+      );
    } catch {}
  }

  public use(req: Request, res: Response, next: NextFunction) {
    let featureGraphicPath = 'assets/cover.png';

-    if (
-      req.path === '/en/blog/2022/08/500-stars-on-github' ||
-      req.path === '/en/blog/2022/08/500-stars-on-github/'
-    ) {
+    if (req.path.startsWith('/en/blog/2022/08/500-stars-on-github')) {
      featureGraphicPath = 'assets/images/blog/500-stars-on-github.jpg';
+    } else if (req.path.startsWith('/en/blog/2022/10/hacktoberfest-2022')) {
+      featureGraphicPath = 'assets/images/blog/hacktoberfest-2022.png';
+    } else if (req.path.startsWith('/en/blog/2022/11/black-friday-2022')) {
+      featureGraphicPath = 'assets/images/blog/black-friday-2022.jpg';
    }

    if (
@ -61,6 +77,33 @@ export class FrontendMiddleware implements NestMiddleware {
          rootUrl: this.configurationService.get('ROOT_URL')
        })
      );
+    } else if (req.path === '/es' || req.path.startsWith('/es/')) {
+      res.send(
+        this.interpolate(this.indexHtmlEs, {
+          featureGraphicPath,
+          languageCode: 'es',
+          path: req.path,
+          rootUrl: this.configurationService.get('ROOT_URL')
+        })
+      );
+    } else if (req.path === '/it' || req.path.startsWith('/it/')) {
+      res.send(
+        this.interpolate(this.indexHtmlIt, {
+          featureGraphicPath,
+          languageCode: 'it',
+          path: req.path,
+          rootUrl: this.configurationService.get('ROOT_URL')
+        })
+      );
+    } else if (req.path === '/nl' || req.path.startsWith('/nl/')) {
+      res.send(
+        this.interpolate(this.indexHtmlNl, {
+          featureGraphicPath,
+          languageCode: 'nl',
+          path: req.path,
+          rootUrl: this.configurationService.get('ROOT_URL')
+        })
+      );
    } else {
      res.send(
        this.interpolate(this.indexHtmlEn, {
--- a/apps/api/src/app/info/info.service.ts
+++ b/apps/api/src/app/info/info.service.ts
@ -145,6 +145,27 @@ export class InfoService {
    });
  }

+  private async countDockerHubPulls(): Promise<number> {
+    try {
+      const get = bent(
+        `https://hub.docker.com/v2/repositories/ghostfolio/ghostfolio`,
+        'GET',
+        'json',
+        200,
+        {
+          'User-Agent': 'request'
+        }
+      );
+
+      const { pull_count } = await get();
+      return pull_count;
+    } catch (error) {
+      Logger.error(error, 'InfoService');
+
+      return undefined;
+    }
+  }
+
  private async countGitHubContributors(): Promise<number> {
    try {
      const get = bent(
@ -245,6 +266,8 @@ export class InfoService {
    const activeUsers1d = await this.countActiveUsers(1);
    const activeUsers30d = await this.countActiveUsers(30);
    const newUsers30d = await this.countNewUsers(30);
+
+    const dockerHubPulls = await this.countDockerHubPulls();
    const gitHubContributors = await this.countGitHubContributors();
    const gitHubStargazers = await this.countGitHubStargazers();
    const slackCommunityUsers = await this.countSlackCommunityUsers();
@ -252,6 +275,7 @@ export class InfoService {
    statistics = {
      activeUsers1d,
      activeUsers30d,
+      dockerHubPulls,
      gitHubContributors,
      gitHubStargazers,
      newUsers30d,
--- a/apps/api/src/app/order/order.controller.ts
+++ b/apps/api/src/app/order/order.controller.ts
@ -3,8 +3,8 @@ import { nullifyValuesInObjects } from '@ghostfolio/api/helper/object.helper';
 import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
+import { ApiService } from '@ghostfolio/api/services/api/api.service';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
-import { Filter } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
@ -36,6 +36,7 @@ import { UpdateOrderDto } from './update-order.dto';
@Controller('order')
 export class OrderController {
  public constructor(
+    private readonly apiService: ApiService,
    private readonly impersonationService: ImpersonationService,
    private readonly orderService: OrderService,
    @Inject(REQUEST) private readonly request: RequestWithUser,
@ -73,30 +74,11 @@ export class OrderController {
    @Query('assetClasses') filterByAssetClasses?: string,
    @Query('tags') filterByTags?: string
  ): Promise<Activities> {
-    const accountIds = filterByAccounts?.split(',') ?? [];
-    const assetClasses = filterByAssetClasses?.split(',') ?? [];
-    const tagIds = filterByTags?.split(',') ?? [];
-
-    const filters: Filter[] = [
-      ...accountIds.map((accountId) => {
-        return <Filter>{
-          id: accountId,
-          type: 'ACCOUNT'
-        };
-      }),
-      ...assetClasses.map((assetClass) => {
-        return <Filter>{
-          id: assetClass,
-          type: 'ASSET_CLASS'
-        };
-      }),
-      ...tagIds.map((tagId) => {
-        return <Filter>{
-          id: tagId,
-          type: 'TAG'
-        };
-      })
-    ];
+    const filters = this.apiService.buildFiltersFromQueryParams({
+      filterByAccounts,
+      filterByAssetClasses,
+      filterByTags
+    });

    const impersonationUserId =
      await this.impersonationService.validateImpersonationId(
@ -109,7 +91,8 @@ export class OrderController {
      filters,
      userCurrency,
      includeDrafts: true,
-      userId: impersonationUserId || this.request.user.id
+      userId: impersonationUserId || this.request.user.id,
+      withExcludedAccounts: true
    });

    if (
--- a/apps/api/src/app/order/order.module.ts
+++ b/apps/api/src/app/order/order.module.ts
@ -2,6 +2,7 @@ import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { CacheModule } from '@ghostfolio/api/app/cache/cache.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { UserModule } from '@ghostfolio/api/app/user/user.module';
+import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
@ -18,6 +19,7 @@ import { OrderService } from './order.service';
  controllers: [OrderController],
  exports: [OrderService],
  imports: [
+    ApiModule,
    CacheModule,
    ConfigurationModule,
    DataGatheringModule,
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@ -189,13 +189,15 @@ export class OrderService {
    includeDrafts = false,
    types,
    userCurrency,
-    userId
+    userId,
+    withExcludedAccounts = false
  }: {
    filters?: Filter[];
    includeDrafts?: boolean;
    types?: TypeOfOrder[];
    userCurrency: string;
    userId: string;
+    withExcludedAccounts?: boolean;
  }): Promise<Activity[]> {
    const where: Prisma.OrderWhereInput = { userId };

@ -284,24 +286,28 @@ export class OrderService {
        },
        orderBy: { date: 'asc' }
      })
-    ).map((order) => {
-      const value = new Big(order.quantity).mul(order.unitPrice).toNumber();
+    )
+      .filter((order) => {
+        return withExcludedAccounts || order.Account?.isExcluded === false;
+      })
+      .map((order) => {
+        const value = new Big(order.quantity).mul(order.unitPrice).toNumber();

-      return {
-        ...order,
-        value,
-        feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
-          order.fee,
-          order.SymbolProfile.currency,
-          userCurrency
-        ),
-        valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
+        return {
+          ...order,
          value,
-          order.SymbolProfile.currency,
-          userCurrency
-        )
-      };
-    });
+          feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
+            order.fee,
+            order.SymbolProfile.currency,
+            userCurrency
+          ),
+          valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
+            value,
+            order.SymbolProfile.currency,
+            userCurrency
+          )
+        };
+      });
  }

  public async updateOrder({
--- a/apps/api/src/app/portfolio/current-rate.service.mock.ts
+++ b/apps/api/src/app/portfolio/current-rate.service.mock.ts
@ -21,6 +21,17 @@ function mockGetValue(symbol: string, date: Date) {

      return { marketPrice: 0 };

+    case 'BTCUSD':
+      if (isSameDay(parseDate('2015-01-01'), date)) {
+        return { marketPrice: 314.25 };
+      } else if (isSameDay(parseDate('2017-12-31'), date)) {
+        return { marketPrice: 14156.4 };
+      } else if (isSameDay(parseDate('2018-01-01'), date)) {
+        return { marketPrice: 13657.2 };
+      }
+
+      return { marketPrice: 0 };
+
    case 'NOVN.SW':
      if (isSameDay(parseDate('2022-04-11'), date)) {
        return { marketPrice: 87.8 };
--- a/apps/api/src/app/portfolio/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
@ -0,0 +1,110 @@
+import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { parseDate } from '@ghostfolio/common/helper';
+import Big from 'big.js';
+
+import { CurrentRateServiceMock } from './current-rate.service.mock';
+import { PortfolioCalculator } from './portfolio-calculator';
+
+jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    CurrentRateService: jest.fn().mockImplementation(() => {
+      return CurrentRateServiceMock;
+    })
+  };
+});
+
+describe('PortfolioCalculator', () => {
+  let currentRateService: CurrentRateService;
+
+  beforeEach(() => {
+    currentRateService = new CurrentRateService(null, null, null);
+  });
+
+  describe('get current positions', () => {
+    it.only('with BTCUSD buy and sell partially', async () => {
+      const portfolioCalculator = new PortfolioCalculator({
+        currentRateService,
+        currency: 'CHF',
+        orders: [
+          {
+            currency: 'CHF',
+            date: '2015-01-01',
+            dataSource: 'YAHOO',
+            fee: new Big(0),
+            name: 'Bitcoin USD',
+            quantity: new Big(2),
+            symbol: 'BTCUSD',
+            type: 'BUY',
+            unitPrice: new Big(320.43)
+          },
+          {
+            currency: 'CHF',
+            date: '2017-12-31',
+            dataSource: 'YAHOO',
+            fee: new Big(0),
+            name: 'Bitcoin USD',
+            quantity: new Big(1),
+            symbol: 'BTCUSD',
+            type: 'SELL',
+            unitPrice: new Big(14156.4)
+          }
+        ]
+      });
+
+      portfolioCalculator.computeTransactionPoints();
+
+      const spy = jest
+        .spyOn(Date, 'now')
+        .mockImplementation(() => parseDate('2018-01-01').getTime());
+
+      const currentPositions = await portfolioCalculator.getCurrentPositions(
+        parseDate('2015-01-01')
+      );
+
+      const investments = portfolioCalculator.getInvestments();
+
+      const investmentsByMonth = portfolioCalculator.getInvestmentsByMonth();
+
+      spy.mockRestore();
+
+      expect(currentPositions).toEqual({
+        currentValue: new Big('13657.2'),
+        errors: [],
+        grossPerformance: new Big('27172.74'),
+        grossPerformancePercentage: new Big('42.40043067128546016291'),
+        hasErrors: false,
+        netPerformance: new Big('27172.74'),
+        netPerformancePercentage: new Big('42.40043067128546016291'),
+        positions: [
+          {
+            averagePrice: new Big('320.43'),
+            currency: 'CHF',
+            dataSource: 'YAHOO',
+            firstBuyDate: '2015-01-01',
+            grossPerformance: new Big('27172.74'),
+            grossPerformancePercentage: new Big('42.40043067128546016291'),
+            investment: new Big('320.43'),
+            netPerformance: new Big('27172.74'),
+            netPerformancePercentage: new Big('42.40043067128546016291'),
+            marketPrice: 13657.2,
+            quantity: new Big('1'),
+            symbol: 'BTCUSD',
+            transactionCount: 2
+          }
+        ],
+        totalInvestment: new Big('320.43')
+      });
+
+      expect(investments).toEqual([
+        { date: '2015-01-01', investment: new Big('640.86') },
+        { date: '2017-12-31', investment: new Big('320.43') }
+      ]);
+
+      expect(investmentsByMonth).toEqual([
+        { date: '2015-01-01', investment: new Big('640.86') },
+        { date: '2017-12-01', investment: new Big('-14156.4') }
+      ]);
+    });
+  });
+});
--- a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
@ -22,7 +22,7 @@ describe('PortfolioCalculator', () => {
  });

  describe('get current positions', () => {
-    it.only('with BALN.SW buy and sell', async () => {
+    it.only('with NOVN.SW buy and sell partially', async () => {
      const portfolioCalculator = new PortfolioCalculator({
        currentRateService,
        currency: 'CHF',
--- a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts
@ -0,0 +1,130 @@
+import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { parseDate } from '@ghostfolio/common/helper';
+import Big from 'big.js';
+
+import { CurrentRateServiceMock } from './current-rate.service.mock';
+import { PortfolioCalculator } from './portfolio-calculator';
+
+jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    CurrentRateService: jest.fn().mockImplementation(() => {
+      return CurrentRateServiceMock;
+    })
+  };
+});
+
+describe('PortfolioCalculator', () => {
+  let currentRateService: CurrentRateService;
+
+  beforeEach(() => {
+    currentRateService = new CurrentRateService(null, null, null);
+  });
+
+  describe('get current positions', () => {
+    it.only('with NOVN.SW buy and sell', async () => {
+      const portfolioCalculator = new PortfolioCalculator({
+        currentRateService,
+        currency: 'CHF',
+        orders: [
+          {
+            currency: 'CHF',
+            date: '2022-03-07',
+            dataSource: 'YAHOO',
+            fee: new Big(0),
+            name: 'Novartis AG',
+            quantity: new Big(2),
+            symbol: 'NOVN.SW',
+            type: 'BUY',
+            unitPrice: new Big(75.8)
+          },
+          {
+            currency: 'CHF',
+            date: '2022-04-08',
+            dataSource: 'YAHOO',
+            fee: new Big(0),
+            name: 'Novartis AG',
+            quantity: new Big(2),
+            symbol: 'NOVN.SW',
+            type: 'SELL',
+            unitPrice: new Big(85.73)
+          }
+        ]
+      });
+
+      portfolioCalculator.computeTransactionPoints();
+
+      const spy = jest
+        .spyOn(Date, 'now')
+        .mockImplementation(() => parseDate('2022-04-11').getTime());
+
+      const chartData = await portfolioCalculator.getChartData(
+        parseDate('2022-03-07')
+      );
+
+      const currentPositions = await portfolioCalculator.getCurrentPositions(
+        parseDate('2022-03-07')
+      );
+
+      const investments = portfolioCalculator.getInvestments();
+
+      const investmentsByMonth = portfolioCalculator.getInvestmentsByMonth();
+
+      spy.mockRestore();
+
+      expect(chartData[0]).toEqual({
+        date: '2022-03-07',
+        netPerformanceInPercentage: 0,
+        netPerformance: 0,
+        totalInvestment: 151.6,
+        value: 151.6
+      });
+
+      expect(chartData[chartData.length - 1]).toEqual({
+        date: '2022-04-11',
+        netPerformanceInPercentage: 13.100263852242744,
+        netPerformance: 19.86,
+        totalInvestment: 0,
+        value: 19.86
+      });
+
+      expect(currentPositions).toEqual({
+        currentValue: new Big('0'),
+        errors: [],
+        grossPerformance: new Big('19.86'),
+        grossPerformancePercentage: new Big('0.13100263852242744063'),
+        hasErrors: false,
+        netPerformance: new Big('19.86'),
+        netPerformancePercentage: new Big('0.13100263852242744063'),
+        positions: [
+          {
+            averagePrice: new Big('0'),
+            currency: 'CHF',
+            dataSource: 'YAHOO',
+            firstBuyDate: '2022-03-07',
+            grossPerformance: new Big('19.86'),
+            grossPerformancePercentage: new Big('0.13100263852242744063'),
+            investment: new Big('0'),
+            netPerformance: new Big('19.86'),
+            netPerformancePercentage: new Big('0.13100263852242744063'),
+            marketPrice: 87.8,
+            quantity: new Big('0'),
+            symbol: 'NOVN.SW',
+            transactionCount: 2
+          }
+        ],
+        totalInvestment: new Big('0')
+      });
+
+      expect(investments).toEqual([
+        { date: '2022-03-07', investment: new Big('151.6') },
+        { date: '2022-04-08', investment: new Big('0') }
+      ]);
+
+      expect(investmentsByMonth).toEqual([
+        { date: '2022-03-01', investment: new Big('151.6') },
+        { date: '2022-04-01', investment: new Big('-171.46') }
+      ]);
+    });
+  });
+});
--- a/apps/api/src/app/portfolio/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator.ts
@ -14,6 +14,7 @@ import {
  format,
  isAfter,
  isBefore,
+  isSameDay,
  isSameMonth,
  isSameYear,
  max,
@ -187,7 +188,9 @@ export class PortfolioCalculator {
      day = addDays(day, step);
    }

-    dates.push(resetHours(end));
+    if (!isSameDay(last(dates), end)) {
+      dates.push(resetHours(end));
+    }

    for (const item of transactionPointsBeforeEndDate[firstIndex - 1].items) {
      dataGatheringItems.push({
@ -231,21 +234,28 @@ export class PortfolioCalculator {
      [symbol: string]: { [date: string]: Big };
    } = {};

+    const maxInvestmentValuesBySymbol: {
+      [symbol: string]: { [date: string]: Big };
+    } = {};
+
    const totalNetPerformanceValues: { [date: string]: Big } = {};
    const totalInvestmentValues: { [date: string]: Big } = {};
+    const maxTotalInvestmentValues: { [date: string]: Big } = {};

    for (const symbol of Object.keys(symbols)) {
-      const { netPerformanceValues, investmentValues } = this.getSymbolMetrics({
-        end,
-        marketSymbolMap,
-        start,
-        step,
-        symbol,
-        isChartMode: true
-      });
+      const { investmentValues, maxInvestmentValues, netPerformanceValues } =
+        this.getSymbolMetrics({
+          end,
+          marketSymbolMap,
+          start,
+          step,
+          symbol,
+          isChartMode: true
+        });

      netPerformanceValuesBySymbol[symbol] = netPerformanceValues;
      investmentValuesBySymbol[symbol] = investmentValues;
+      maxInvestmentValuesBySymbol[symbol] = maxInvestmentValues;
    }

    for (const currentDate of dates) {
@ -264,31 +274,40 @@ export class PortfolioCalculator {
        totalInvestmentValues[dateString] =
          totalInvestmentValues[dateString] ?? new Big(0);

+        maxTotalInvestmentValues[dateString] =
+          maxTotalInvestmentValues[dateString] ?? new Big(0);
+
        if (investmentValuesBySymbol[symbol]?.[dateString]) {
          totalInvestmentValues[dateString] = totalInvestmentValues[
            dateString
          ].add(investmentValuesBySymbol[symbol][dateString]);
        }
+
+        if (maxInvestmentValuesBySymbol[symbol]?.[dateString]) {
+          maxTotalInvestmentValues[dateString] = maxTotalInvestmentValues[
+            dateString
+          ].add(maxInvestmentValuesBySymbol[symbol][dateString]);
+        }
      }
    }

-    const isInPercentage = true;
-
    return Object.keys(totalNetPerformanceValues).map((date) => {
-      return isInPercentage
-        ? {
-            date,
-            value: totalInvestmentValues[date].eq(0)
-              ? 0
-              : totalNetPerformanceValues[date]
-                  .div(totalInvestmentValues[date])
-                  .mul(100)
-                  .toNumber()
-          }
-        : {
-            date,
-            value: totalNetPerformanceValues[date].toNumber()
-          };
+      const netPerformanceInPercentage = maxTotalInvestmentValues[date].eq(0)
+        ? 0
+        : totalNetPerformanceValues[date]
+            .div(maxTotalInvestmentValues[date])
+            .mul(100)
+            .toNumber();
+
+      return {
+        date,
+        netPerformanceInPercentage,
+        netPerformance: totalNetPerformanceValues[date].toNumber(),
+        totalInvestment: totalInvestmentValues[date].toNumber(),
+        value: totalInvestmentValues[date]
+          .plus(totalNetPerformanceValues[date])
+          .toNumber()
+      };
    });
  }

@ -896,13 +915,10 @@ export class PortfolioCalculator {
    let initialValue: Big;
    let investmentAtStartDate: Big;
    const investmentValues: { [date: string]: Big } = {};
+    const maxInvestmentValues: { [date: string]: Big } = {};
    let lastAveragePrice = new Big(0);
-    let lastTransactionInvestment = new Big(0);
-    let lastValueOfInvestmentBeforeTransaction = new Big(0);
    let maxTotalInvestment = new Big(0);
    const netPerformanceValues: { [date: string]: Big } = {};
-    let timeWeightedGrossPerformancePercentage = new Big(1);
-    let timeWeightedNetPerformancePercentage = new Big(1);
    let totalInvestment = new Big(0);
    let totalInvestmentWithGrossPerformanceFromSell = new Big(0);
    let totalUnits = new Big(0);
@ -997,6 +1013,12 @@ export class PortfolioCalculator {
    for (let i = 0; i < orders.length; i += 1) {
      const order = orders[i];

+      if (PortfolioCalculator.ENABLE_LOGGING) {
+        console.log();
+        console.log();
+        console.log(i + 1, order.type, order.itemType);
+      }
+
      if (order.itemType === 'start') {
        // Take the unit price of the order as the market price if there are no
        // orders of this symbol before the start date
@ -1024,9 +1046,21 @@ export class PortfolioCalculator {
        valueAtStartDate = valueOfInvestmentBeforeTransaction;
      }

-      const transactionInvestment = order.quantity
-        .mul(order.unitPrice)
-        .mul(this.getFactor(order.type));
+      const transactionInvestment =
+        order.type === 'BUY'
+          ? order.quantity.mul(order.unitPrice).mul(this.getFactor(order.type))
+          : totalUnits.gt(0)
+          ? totalInvestment
+              .div(totalUnits)
+              .mul(order.quantity)
+              .mul(this.getFactor(order.type))
+          : new Big(0);
+
+      if (PortfolioCalculator.ENABLE_LOGGING) {
+        console.log('totalInvestment', totalInvestment.toNumber());
+        console.log('order.quantity', order.quantity.toNumber());
+        console.log('transactionInvestment', transactionInvestment.toNumber());
+      }

      totalInvestment = totalInvestment.plus(transactionInvestment);

@ -1075,59 +1109,23 @@ export class PortfolioCalculator {
        ? new Big(0)
        : totalInvestmentWithGrossPerformanceFromSell.div(totalUnits);

-      const newGrossPerformance = valueOfInvestment
-        .minus(totalInvestmentWithGrossPerformanceFromSell)
-        .plus(grossPerformanceFromSells);
-
-      if (
-        i > indexOfStartOrder &&
-        !lastValueOfInvestmentBeforeTransaction
-          .plus(lastTransactionInvestment)
-          .eq(0)
-      ) {
-        const grossHoldingPeriodReturn = valueOfInvestmentBeforeTransaction
-          .minus(
-            lastValueOfInvestmentBeforeTransaction.plus(
-              lastTransactionInvestment
-            )
-          )
-          .div(
-            lastValueOfInvestmentBeforeTransaction.plus(
-              lastTransactionInvestment
-            )
-          );
-
-        timeWeightedGrossPerformancePercentage =
-          timeWeightedGrossPerformancePercentage.mul(
-            new Big(1).plus(grossHoldingPeriodReturn)
-          );
-
-        const netHoldingPeriodReturn = valueOfInvestmentBeforeTransaction
-          .minus(fees.minus(feesAtStartDate))
-          .minus(
-            lastValueOfInvestmentBeforeTransaction.plus(
-              lastTransactionInvestment
-            )
-          )
-          .div(
-            lastValueOfInvestmentBeforeTransaction.plus(
-              lastTransactionInvestment
-            )
-          );
-
-        timeWeightedNetPerformancePercentage =
-          timeWeightedNetPerformancePercentage.mul(
-            new Big(1).plus(netHoldingPeriodReturn)
-          );
+      if (PortfolioCalculator.ENABLE_LOGGING) {
+        console.log(
+          'totalInvestmentWithGrossPerformanceFromSell',
+          totalInvestmentWithGrossPerformanceFromSell.toNumber()
+        );
+        console.log(
+          'grossPerformanceFromSells',
+          grossPerformanceFromSells.toNumber()
+        );
      }

+      const newGrossPerformance = valueOfInvestment
+        .minus(totalInvestment)
+        .plus(grossPerformanceFromSells);
+
      grossPerformance = newGrossPerformance;

-      lastTransactionInvestment = transactionInvestment;
-
-      lastValueOfInvestmentBeforeTransaction =
-        valueOfInvestmentBeforeTransaction;
-
      if (order.itemType === 'start') {
        feesAtStartDate = fees;
        grossPerformanceAtStartDate = grossPerformance;
@ -1139,6 +1137,15 @@ export class PortfolioCalculator {
          .minus(fees.minus(feesAtStartDate));

        investmentValues[order.date] = totalInvestment;
+        maxInvestmentValues[order.date] = maxTotalInvestment;
+      }
+
+      if (PortfolioCalculator.ENABLE_LOGGING) {
+        console.log('totalInvestment', totalInvestment.toNumber());
+        console.log(
+          'totalGrossPerformance',
+          grossPerformance.minus(grossPerformanceAtStartDate).toNumber()
+        );
      }

      if (i === indexOfEndOrder) {
@ -1146,12 +1153,6 @@ export class PortfolioCalculator {
      }
    }

-    timeWeightedGrossPerformancePercentage =
-      timeWeightedGrossPerformancePercentage.minus(1);
-
-    timeWeightedNetPerformancePercentage =
-      timeWeightedNetPerformancePercentage.minus(1);
-
    const totalGrossPerformance = grossPerformance.minus(
      grossPerformanceAtStartDate
    );
@ -1215,6 +1216,7 @@ export class PortfolioCalculator {
        Average price: ${averagePriceAtStartDate.toFixed(
          2
        )} -> ${averagePriceAtEndDate.toFixed(2)}
+        Total investment: ${totalInvestment.toFixed(2)}
        Max. total investment: ${maxTotalInvestment.toFixed(2)}
        Gross performance: ${totalGrossPerformance.toFixed(
          2
@ -1230,6 +1232,7 @@ export class PortfolioCalculator {
      initialValue,
      grossPerformancePercentage,
      investmentValues,
+      maxInvestmentValues,
      netPerformancePercentage,
      netPerformanceValues,
      hasErrors: totalUnits.gt(0) && (!initialValue || !unitPriceAtEndDate),
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@ -7,18 +7,15 @@ import {
 import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
+import { ApiService } from '@ghostfolio/api/services/api/api.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { parseDate } from '@ghostfolio/common/helper';
 import {
-  Filter,
-  PortfolioChart,
  PortfolioDetails,
  PortfolioInvestments,
  PortfolioPerformanceResponse,
  PortfolioPublicDetails,
-  PortfolioReport,
-  PortfolioSummary
+  PortfolioReport
 } from '@ghostfolio/common/interfaces';
 import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
 import type {
@ -40,6 +37,7 @@ import {
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
+import Big from 'big.js';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';

 import { PortfolioPositionDetail } from './interfaces/portfolio-position-detail.interface';
@ -52,6 +50,7 @@ export class PortfolioController {

  public constructor(
    private readonly accessService: AccessService,
+    private readonly apiService: ApiService,
    private readonly configurationService: ConfigurationService,
    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly portfolioService: PortfolioService,
@ -61,75 +60,6 @@ export class PortfolioController {
    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
  }

-  @Get('chart')
-  @UseGuards(AuthGuard('jwt'))
-  public async getChart(
-    @Headers('impersonation-id') impersonationId: string,
-    @Query('range') range
-  ): Promise<PortfolioChart> {
-    const historicalDataContainer = await this.portfolioService.getChart(
-      impersonationId,
-      range
-    );
-
-    let chartData = historicalDataContainer.items;
-
-    let hasError = false;
-
-    chartData.forEach((chartDataItem) => {
-      if (hasNotDefinedValuesInObject(chartDataItem)) {
-        hasError = true;
-      }
-    });
-
-    if (
-      impersonationId ||
-      this.userService.isRestrictedView(this.request.user)
-    ) {
-      let maxValue = 0;
-
-      chartData.forEach((portfolioItem) => {
-        if (portfolioItem.value > maxValue) {
-          maxValue = portfolioItem.value;
-        }
-      });
-
-      chartData = chartData.map((historicalDataItem) => {
-        return {
-          ...historicalDataItem,
-          marketPrice: Number((historicalDataItem.value / maxValue).toFixed(2))
-        };
-      });
-    }
-
-    return {
-      hasError,
-      chart: chartData,
-      isAllTimeHigh: historicalDataContainer.isAllTimeHigh,
-      isAllTimeLow: historicalDataContainer.isAllTimeLow
-    };
-  }
-
-  @Get('chart')
-  @UseGuards(AuthGuard('jwt'))
-  @Version('2')
-  public async getChartV2(
-    @Headers('impersonation-id') impersonationId: string,
-    @Query('range') range
-  ): Promise<PortfolioChart> {
-    const historicalDataContainer = await this.portfolioService.getChartV2(
-      impersonationId,
-      range
-    );
-
-    return {
-      chart: historicalDataContainer.items,
-      hasError: false,
-      isAllTimeHigh: false,
-      isAllTimeLow: false
-    };
-  }
-
  @Get('details')
  @UseGuards(AuthGuard('jwt'))
  @UseInterceptors(RedactValuesInResponseInterceptor)
@ -138,35 +68,21 @@ export class PortfolioController {
    @Headers('impersonation-id') impersonationId: string,
    @Query('accounts') filterByAccounts?: string,
    @Query('assetClasses') filterByAssetClasses?: string,
-    @Query('range') range?: DateRange,
+    @Query('range') dateRange: DateRange = 'max',
    @Query('tags') filterByTags?: string
  ): Promise<PortfolioDetails & { hasError: boolean }> {
+    let hasDetails = true;
    let hasError = false;

-    const accountIds = filterByAccounts?.split(',') ?? [];
-    const assetClasses = filterByAssetClasses?.split(',') ?? [];
-    const tagIds = filterByTags?.split(',') ?? [];
+    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
+      hasDetails = this.request.user.subscription.type === 'Premium';
+    }

-    const filters: Filter[] = [
-      ...accountIds.map((accountId) => {
-        return <Filter>{
-          id: accountId,
-          type: 'ACCOUNT'
-        };
-      }),
-      ...assetClasses.map((assetClass) => {
-        return <Filter>{
-          id: assetClass,
-          type: 'ASSET_CLASS'
-        };
-      }),
-      ...tagIds.map((tagId) => {
-        return <Filter>{
-          id: tagId,
-          type: 'TAG'
-        };
-      })
-    ];
+    const filters = this.apiService.buildFiltersFromQueryParams({
+      filterByAccounts,
+      filterByAssetClasses,
+      filterByTags
+    });

    const {
      accounts,
@ -174,18 +90,21 @@ export class PortfolioController {
      filteredValueInPercentage,
      hasErrors,
      holdings,
+      summary,
      totalValueInBaseCurrency
-    } = await this.portfolioService.getDetails(
+    } = await this.portfolioService.getDetails({
+      dateRange,
+      filters,
      impersonationId,
-      this.request.user.id,
-      range,
-      filters
-    );
+      userId: this.request.user.id
+    });

    if (hasErrors || hasNotDefinedValuesInObject(holdings)) {
      hasError = true;
    }

+    let portfolioSummary = summary;
+
    if (
      impersonationId ||
      this.userService.isRestrictedView(this.request.user)
@ -221,9 +140,26 @@ export class PortfolioController {
      }
    }

-    let hasDetails = true;
-    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
-      hasDetails = this.request.user.subscription.type === 'Premium';
+    if (
+      hasDetails === false ||
+      impersonationId ||
+      this.userService.isRestrictedView(this.request.user)
+    ) {
+      portfolioSummary = nullifyValuesInObject(summary, [
+        'cash',
+        'committedFunds',
+        'currentGrossPerformance',
+        'currentNetPerformance',
+        'currentValue',
+        'dividend',
+        'emergencyFund',
+        'excludedAccountsAndActivities',
+        'fees',
+        'items',
+        'netWorth',
+        'totalBuy',
+        'totalSell'
+      ]);
    }

    for (const [symbol, portfolioPosition] of Object.entries(holdings)) {
@ -244,7 +180,8 @@ export class PortfolioController {
      filteredValueInPercentage,
      hasError,
      holdings,
-      totalValueInBaseCurrency
+      totalValueInBaseCurrency,
+      summary: portfolioSummary
    };
  }

@ -252,27 +189,22 @@ export class PortfolioController {
  @UseGuards(AuthGuard('jwt'))
  public async getInvestments(
    @Headers('impersonation-id') impersonationId: string,
+    @Query('range') dateRange: DateRange = 'max',
    @Query('groupBy') groupBy?: GroupBy
  ): Promise<PortfolioInvestments> {
-    if (
-      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
-      this.request.user.subscription.type === 'Basic'
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
    let investments: InvestmentItem[];

    if (groupBy === 'month') {
-      investments = await this.portfolioService.getInvestments(
+      investments = await this.portfolioService.getInvestments({
+        dateRange,
        impersonationId,
-        'month'
-      );
+        groupBy: 'month'
+      });
    } else {
-      investments = await this.portfolioService.getInvestments(impersonationId);
+      investments = await this.portfolioService.getInvestments({
+        dateRange,
+        impersonationId
+      });
    }

    if (
@ -290,29 +222,71 @@ export class PortfolioController {
      }));
    }

-    return { firstOrderDate: parseDate(investments[0]?.date), investments };
+    if (
+      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
+      this.request.user.subscription.type === 'Basic'
+    ) {
+      investments = investments.map((item) => {
+        return nullifyValuesInObject(item, ['investment']);
+      });
+    }
+
+    return { investments };
  }

  @Get('performance')
  @UseGuards(AuthGuard('jwt'))
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
-  public async getPerformance(
+  @Version('2')
+  public async getPerformanceV2(
    @Headers('impersonation-id') impersonationId: string,
-    @Query('range') range
+    @Query('range') dateRange: DateRange = 'max'
  ): Promise<PortfolioPerformanceResponse> {
-    const performanceInformation = await this.portfolioService.getPerformance(
+    const performanceInformation = await this.portfolioService.getPerformance({
+      dateRange,
      impersonationId,
-      range
-    );
+      userId: this.request.user.id
+    });

    if (
      impersonationId ||
      this.request.user.Settings.settings.viewMode === 'ZEN' ||
      this.userService.isRestrictedView(this.request.user)
    ) {
+      performanceInformation.chart = performanceInformation.chart.map(
+        ({ date, netPerformanceInPercentage, totalInvestment, value }) => {
+          return {
+            date,
+            netPerformanceInPercentage,
+            totalInvestment: new Big(totalInvestment)
+              .div(performanceInformation.performance.totalInvestment)
+              .toNumber(),
+            value: new Big(value)
+              .div(performanceInformation.performance.currentValue)
+              .toNumber()
+          };
+        }
+      );
+
      performanceInformation.performance = nullifyValuesInObject(
        performanceInformation.performance,
-        ['currentGrossPerformance', 'currentValue']
+        [
+          'currentGrossPerformance',
+          'currentNetPerformance',
+          'currentValue',
+          'totalInvestment'
+        ]
+      );
+    }
+
+    if (
+      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
+      this.request.user.subscription.type === 'Basic'
+    ) {
+      performanceInformation.chart = performanceInformation.chart.map(
+        (item) => {
+          return nullifyValuesInObject(item, ['totalInvestment', 'value']);
+        }
      );
    }

@ -324,11 +298,11 @@ export class PortfolioController {
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
  public async getPositions(
    @Headers('impersonation-id') impersonationId: string,
-    @Query('range') range
+    @Query('range') dateRange: DateRange = 'max'
  ): Promise<PortfolioPositions> {
    const result = await this.portfolioService.getPositions(
      impersonationId,
-      range
+      dateRange
    );

    if (
@ -369,12 +343,12 @@ export class PortfolioController {
      hasDetails = user.subscription.type === 'Premium';
    }

-    const { holdings } = await this.portfolioService.getDetails(
-      access.userId,
-      access.userId,
-      'max',
-      [{ id: 'EQUITY', type: 'ASSET_CLASS' }]
-    );
+    const { holdings } = await this.portfolioService.getDetails({
+      dateRange: 'max',
+      filters: [{ id: 'EQUITY', type: 'ASSET_CLASS' }],
+      impersonationId: access.userId,
+      userId: user.id
+    });

    const portfolioPublicDetails: PortfolioPublicDetails = {
      hasDetails,
@ -411,46 +385,6 @@ export class PortfolioController {
    return portfolioPublicDetails;
  }

-  @Get('summary')
-  @UseGuards(AuthGuard('jwt'))
-  public async getSummary(
-    @Headers('impersonation-id') impersonationId
-  ): Promise<PortfolioSummary> {
-    if (
-      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
-      this.request.user.subscription.type === 'Basic'
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    let summary = await this.portfolioService.getSummary(impersonationId);
-
-    if (
-      impersonationId ||
-      this.userService.isRestrictedView(this.request.user)
-    ) {
-      summary = nullifyValuesInObject(summary, [
-        'cash',
-        'committedFunds',
-        'currentGrossPerformance',
-        'currentNetPerformance',
-        'currentValue',
-        'dividend',
-        'emergencyFund',
-        'fees',
-        'items',
-        'netWorth',
-        'totalBuy',
-        'totalSell'
-      ]);
-    }
-
-    return summary;
-  }
-
  @Get('position/:dataSource/:symbol')
  @UseInterceptors(TransformDataSourceInRequestInterceptor)
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
@ -495,16 +429,19 @@ export class PortfolioController {
  public async getReport(
    @Headers('impersonation-id') impersonationId: string
  ): Promise<PortfolioReport> {
+    const report = await this.portfolioService.getReport(impersonationId);
+
    if (
      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
      this.request.user.subscription.type === 'Basic'
    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
+      for (const rule in report.rules) {
+        if (report.rules[rule]) {
+          report.rules[rule] = [];
+        }
+      }
    }

-    return await this.portfolioService.getReport(impersonationId);
+    return report;
  }
 }
--- a/apps/api/src/app/portfolio/portfolio.module.ts
+++ b/apps/api/src/app/portfolio/portfolio.module.ts
@ -2,6 +2,7 @@ import { AccessModule } from '@ghostfolio/api/app/access/access.module';
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { OrderModule } from '@ghostfolio/api/app/order/order.module';
 import { UserModule } from '@ghostfolio/api/app/user/user.module';
+import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
@ -22,6 +23,7 @@ import { RulesService } from './rules.service';
  exports: [PortfolioService],
  imports: [
    AccessModule,
+    ApiModule,
    ConfigurationModule,
    DataGatheringModule,
    DataProviderModule,
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@ -3,7 +3,6 @@ import { CashDetails } from '@ghostfolio/api/app/account/interfaces/cash-details
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
 import { PortfolioOrder } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-order.interface';
-import { TimelineSpecification } from '@ghostfolio/api/app/portfolio/interfaces/timeline-specification.interface';
 import { TransactionPoint } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point.interface';
 import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { AccountClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/current-investment';
@ -32,11 +31,13 @@ import {
  HistoricalDataItem,
  PortfolioDetails,
  PortfolioPerformanceResponse,
+  PortfolioPosition,
  PortfolioReport,
  PortfolioSummary,
  Position,
  TimelinePosition,
-  UserSettings
+  UserSettings,
+  UserWithSettings
 } from '@ghostfolio/common/interfaces';
 import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
 import type {
@ -50,8 +51,11 @@ import type {
 import { Inject, Injectable } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import {
+  Account,
  AssetClass,
  DataSource,
+  Order,
+  Platform,
  Prisma,
  Tag,
  Type as TypeOfOrder
@ -64,11 +68,9 @@ import {
  isAfter,
  isBefore,
  max,
-  parse,
  parseISO,
  set,
  setDayOfYear,
-  startOfDay,
  subDays,
  subYears
 } from 'date-fns';
@ -104,14 +106,19 @@ export class PortfolioService {
    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
  }

-  public async getAccounts(
-    aUserId: string,
-    aFilters?: Filter[]
-  ): Promise<AccountWithValue[]> {
-    const where: Prisma.AccountWhereInput = { userId: aUserId };
+  public async getAccounts({
+    filters,
+    userId,
+    withExcludedAccounts = false
+  }: {
+    filters?: Filter[];
+    userId: string;
+    withExcludedAccounts?: boolean;
+  }): Promise<AccountWithValue[]> {
+    const where: Prisma.AccountWhereInput = { userId: userId };

-    if (aFilters?.[0].id && aFilters?.[0].type === 'ACCOUNT') {
-      where.id = aFilters[0].id;
+    if (filters?.[0].id && filters?.[0].type === 'ACCOUNT') {
+      where.id = filters[0].id;
    }

    const [accounts, details] = await Promise.all([
@ -120,7 +127,12 @@ export class PortfolioService {
        include: { Order: true, Platform: true },
        orderBy: { name: 'asc' }
      }),
-      this.getDetails(aUserId, aUserId, undefined, aFilters)
+      this.getDetails({
+        filters,
+        withExcludedAccounts,
+        impersonationId: userId,
+        userId: this.request.user.id
+      })
    ]);

    const userCurrency = this.request.user.Settings.settings.baseCurrency;
@ -158,11 +170,20 @@ export class PortfolioService {
    });
  }

-  public async getAccountsWithAggregations(
-    aUserId: string,
-    aFilters?: Filter[]
-  ): Promise<Accounts> {
-    const accounts = await this.getAccounts(aUserId, aFilters);
+  public async getAccountsWithAggregations({
+    filters,
+    userId,
+    withExcludedAccounts = false
+  }: {
+    filters?: Filter[];
+    userId: string;
+    withExcludedAccounts?: boolean;
+  }): Promise<Accounts> {
+    const accounts = await this.getAccounts({
+      filters,
+      userId,
+      withExcludedAccounts
+    });
    let totalBalanceInBaseCurrency = new Big(0);
    let totalValueInBaseCurrency = new Big(0);
    let transactionCount = 0;
@ -185,11 +206,16 @@ export class PortfolioService {
    };
  }

-  public async getInvestments(
-    aImpersonationId: string,
-    groupBy?: GroupBy
-  ): Promise<InvestmentItem[]> {
-    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
+  public async getInvestments({
+    dateRange,
+    impersonationId,
+    groupBy
+  }: {
+    dateRange: DateRange;
+    impersonationId: string;
+    groupBy?: GroupBy;
+  }): Promise<InvestmentItem[]> {
+    const userId = await this.getUserId(impersonationId, this.request.user.id);

    const { portfolioOrders, transactionPoints } =
      await this.getTransactionPoints({
@ -261,105 +287,32 @@ export class PortfolioService {
      }
    }

-    return sortBy(investments, (investment) => {
+    investments = sortBy(investments, (investment) => {
      return investment.date;
    });
-  }

-  public async getChart(
-    aImpersonationId: string,
-    aDateRange: DateRange = 'max'
-  ): Promise<HistoricalDataContainer> {
-    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
+    const startDate = this.getStartDate(
+      dateRange,
+      parseDate(investments[0]?.date)
+    );

-    const { portfolioOrders, transactionPoints } =
-      await this.getTransactionPoints({
-        userId
-      });
-
-    const portfolioCalculator = new PortfolioCalculator({
-      currency: this.request.user.Settings.settings.baseCurrency,
-      currentRateService: this.currentRateService,
-      orders: portfolioOrders
+    return investments.filter(({ date }) => {
+      return !isBefore(parseDate(date), startDate);
    });
-
-    portfolioCalculator.setTransactionPoints(transactionPoints);
-    if (transactionPoints.length === 0) {
-      return {
-        isAllTimeHigh: false,
-        isAllTimeLow: false,
-        items: []
-      };
-    }
-    let portfolioStart = parse(
-      transactionPoints[0].date,
-      DATE_FORMAT,
-      new Date()
-    );
-
-    // Get start date for the full portfolio because of because of the
-    // min and max calculation
-    portfolioStart = this.getStartDate('max', portfolioStart);
-
-    const timelineSpecification: TimelineSpecification[] = [
-      {
-        start: format(portfolioStart, DATE_FORMAT),
-        accuracy: 'day'
-      }
-    ];
-
-    const timelineInfo = await portfolioCalculator.calculateTimeline(
-      timelineSpecification,
-      format(new Date(), DATE_FORMAT)
-    );
-
-    const timeline = timelineInfo.timelinePeriods;
-
-    const items = timeline
-      .filter((timelineItem) => timelineItem !== null)
-      .map((timelineItem) => ({
-        date: timelineItem.date,
-        value: timelineItem.netPerformance.toNumber()
-      }));
-
-    let lastItem = null;
-    if (timeline.length > 0) {
-      lastItem = timeline[timeline.length - 1];
-    }
-
-    let isAllTimeHigh = timelineInfo.maxNetPerformance?.eq(
-      lastItem?.netPerformance ?? 0
-    );
-    let isAllTimeLow = timelineInfo.minNetPerformance?.eq(
-      lastItem?.netPerformance ?? 0
-    );
-    if (isAllTimeHigh && isAllTimeLow) {
-      isAllTimeHigh = false;
-      isAllTimeLow = false;
-    }
-
-    portfolioStart = startOfDay(
-      this.getStartDate(
-        aDateRange,
-        parse(transactionPoints[0].date, DATE_FORMAT, new Date())
-      )
-    );
-
-    return {
-      isAllTimeHigh,
-      isAllTimeLow,
-      items: items.filter((item) => {
-        // Filter items of date range
-        return !isAfter(portfolioStart, parseDate(item.date));
-      })
-    };
  }

-  public async getChartV2(
-    aImpersonationId: string,
-    aDateRange: DateRange = 'max'
-  ): Promise<HistoricalDataContainer> {
-    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
+  public async getChart({
+    dateRange = 'max',
+    impersonationId,
+    userCurrency,
+    userId
+  }: {
+    dateRange?: DateRange;
+    impersonationId: string;
+    userCurrency: string;
+    userId: string;
+  }): Promise<HistoricalDataContainer> {
+    userId = await this.getUserId(impersonationId, userId);

    const { portfolioOrders, transactionPoints } =
      await this.getTransactionPoints({
@ -367,7 +320,7 @@ export class PortfolioService {
      });

    const portfolioCalculator = new PortfolioCalculator({
-      currency: this.request.user.Settings.settings.baseCurrency,
+      currency: userCurrency,
      currentRateService: this.currentRateService,
      orders: portfolioOrders
    });
@ -383,7 +336,7 @@ export class PortfolioService {
    const endDate = new Date();

    const portfolioStart = parseDate(transactionPoints[0].date);
-    const startDate = this.getStartDate(aDateRange, portfolioStart);
+    const startDate = this.getStartDate(dateRange, portfolioStart);

    const daysInMarket = differenceInDays(new Date(), startDate);
    const step = Math.round(
@ -403,27 +356,32 @@ export class PortfolioService {
    };
  }

-  public async getDetails(
-    aImpersonationId: string,
-    aUserId: string,
-    aDateRange: DateRange = 'max',
-    aFilters?: Filter[]
-  ): Promise<PortfolioDetails & { hasErrors: boolean }> {
-    const userId = await this.getUserId(aImpersonationId, aUserId);
+  public async getDetails({
+    impersonationId,
+    dateRange = 'max',
+    filters,
+    userId,
+    withExcludedAccounts = false
+  }: {
+    impersonationId: string;
+    dateRange?: DateRange;
+    filters?: Filter[];
+    userId: string;
+    withExcludedAccounts?: boolean;
+  }): Promise<PortfolioDetails & { hasErrors: boolean }> {
+    userId = await this.getUserId(impersonationId, userId);
    const user = await this.userService.user({ id: userId });
+    const userCurrency = this.getUserCurrency(user);

    const emergencyFund = new Big(
      (user.Settings?.settings as UserSettings)?.emergencyFund ?? 0
    );
-    const userCurrency =
-      user.Settings?.settings.baseCurrency ??
-      this.request.user?.Settings?.settings.baseCurrency ??
-      this.baseCurrency;

    const { orders, portfolioOrders, transactionPoints } =
      await this.getTransactionPoints({
+        filters,
        userId,
-        filters: aFilters
+        withExcludedAccounts
      });

    const portfolioCalculator = new PortfolioCalculator({
@ -437,15 +395,15 @@ export class PortfolioService {
    const portfolioStart = parseDate(
      transactionPoints[0]?.date ?? format(new Date(), DATE_FORMAT)
    );
-    const startDate = this.getStartDate(aDateRange, portfolioStart);
+    const startDate = this.getStartDate(dateRange, portfolioStart);
    const currentPositions = await portfolioCalculator.getCurrentPositions(
      startDate
    );

    const cashDetails = await this.accountService.getCashDetails({
+      filters,
      userId,
-      currency: userCurrency,
-      filters: aFilters
+      currency: userCurrency
    });

    const holdings: PortfolioDetails['holdings'] = {};
@ -455,10 +413,10 @@ export class PortfolioService {
    let filteredValueInBaseCurrency = currentPositions.currentValue;

    if (
-      aFilters?.length === 0 ||
-      (aFilters?.length === 1 &&
-        aFilters[0].type === 'ASSET_CLASS' &&
-        aFilters[0].id === 'CASH')
+      filters?.length === 0 ||
+      (filters?.length === 1 &&
+        filters[0].type === 'ASSET_CLASS' &&
+        filters[0].id === 'CASH')
    ) {
      filteredValueInBaseCurrency = filteredValueInBaseCurrency.plus(
        cashDetails.balanceInBaseCurrency
@ -554,10 +512,10 @@ export class PortfolioService {
    }

    if (
-      aFilters?.length === 0 ||
-      (aFilters?.length === 1 &&
-        aFilters[0].type === 'ASSET_CLASS' &&
-        aFilters[0].id === 'CASH')
+      filters?.length === 0 ||
+      (filters?.length === 1 &&
+        filters[0].type === 'ASSET_CLASS' &&
+        filters[0].id === 'CASH')
    ) {
      const cashPositions = await this.getCashPositions({
        cashDetails,
@ -573,18 +531,24 @@ export class PortfolioService {
    }

    const accounts = await this.getValueOfAccounts({
+      filters,
      orders,
      portfolioItemsNow,
      userCurrency,
      userId,
-      filters: aFilters
+      withExcludedAccounts
    });

-    const summary = await this.getSummary(aImpersonationId);
+    const summary = await this.getSummary({
+      impersonationId,
+      userCurrency,
+      userId
+    });

    return {
      accounts,
      holdings,
+      summary,
      filteredValueInBaseCurrency: filteredValueInBaseCurrency.toNumber(),
      filteredValueInPercentage: summary.netWorth
        ? filteredValueInBaseCurrency.div(summary.netWorth).toNumber()
@ -599,11 +563,16 @@ export class PortfolioService {
    aImpersonationId: string,
    aSymbol: string
  ): Promise<PortfolioPositionDetail> {
-    const userCurrency = this.request.user.Settings.settings.baseCurrency;
    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
+    const user = await this.userService.user({ id: userId });
+    const userCurrency = this.getUserCurrency(user);

    const orders = (
-      await this.orderService.getOrders({ userCurrency, userId })
+      await this.orderService.getOrders({
+        userCurrency,
+        userId,
+        withExcludedAccounts: true
+      })
    ).filter(({ SymbolProfile }) => {
      return (
        SymbolProfile.dataSource === aDataSource &&
@ -916,11 +885,18 @@ export class PortfolioService {
    };
  }

-  public async getPerformance(
-    aImpersonationId: string,
-    aDateRange: DateRange = 'max'
-  ): Promise<PortfolioPerformanceResponse> {
-    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
+  public async getPerformance({
+    dateRange = 'max',
+    impersonationId,
+    userId
+  }: {
+    dateRange?: DateRange;
+    impersonationId: string;
+    userId: string;
+  }): Promise<PortfolioPerformanceResponse> {
+    userId = await this.getUserId(impersonationId, userId);
+    const user = await this.userService.user({ id: userId });
+    const userCurrency = this.getUserCurrency(user);

    const { portfolioOrders, transactionPoints } =
      await this.getTransactionPoints({
@ -928,20 +904,23 @@ export class PortfolioService {
      });

    const portfolioCalculator = new PortfolioCalculator({
-      currency: this.request.user.Settings.settings.baseCurrency,
+      currency: userCurrency,
      currentRateService: this.currentRateService,
      orders: portfolioOrders
    });

    if (transactionPoints?.length <= 0) {
      return {
+        chart: [],
+        firstOrderDate: undefined,
        hasErrors: false,
        performance: {
          currentGrossPerformance: 0,
          currentGrossPerformancePercent: 0,
          currentNetPerformance: 0,
          currentNetPerformancePercent: 0,
-          currentValue: 0
+          currentValue: 0,
+          totalInvestment: 0
        }
      };
    }
@ -949,7 +928,7 @@ export class PortfolioService {
    portfolioCalculator.setTransactionPoints(transactionPoints);

    const portfolioStart = parseDate(transactionPoints[0].date);
-    const startDate = this.getStartDate(aDateRange, portfolioStart);
+    const startDate = this.getStartDate(dateRange, portfolioStart);
    const currentPositions = await portfolioCalculator.getCurrentPositions(
      startDate
    );
@ -957,24 +936,61 @@ export class PortfolioService {
    const hasErrors = currentPositions.hasErrors;
    const currentValue = currentPositions.currentValue.toNumber();
    const currentGrossPerformance = currentPositions.grossPerformance;
-    let currentGrossPerformancePercent =
+    const currentGrossPerformancePercent =
      currentPositions.grossPerformancePercentage;
-    const currentNetPerformance = currentPositions.netPerformance;
+    let currentNetPerformance = currentPositions.netPerformance;
    let currentNetPerformancePercent =
      currentPositions.netPerformancePercentage;
+    const totalInvestment = currentPositions.totalInvestment;

-    if (currentGrossPerformance.mul(currentGrossPerformancePercent).lt(0)) {
-      // If algebraic sign is different, harmonize it
-      currentGrossPerformancePercent = currentGrossPerformancePercent.mul(-1);
-    }
+    // if (currentGrossPerformance.mul(currentGrossPerformancePercent).lt(0)) {
+    //   // If algebraic sign is different, harmonize it
+    //   currentGrossPerformancePercent = currentGrossPerformancePercent.mul(-1);
+    // }

-    if (currentNetPerformance.mul(currentNetPerformancePercent).lt(0)) {
-      // If algebraic sign is different, harmonize it
-      currentNetPerformancePercent = currentNetPerformancePercent.mul(-1);
+    // if (currentNetPerformance.mul(currentNetPerformancePercent).lt(0)) {
+    //   // If algebraic sign is different, harmonize it
+    //   currentNetPerformancePercent = currentNetPerformancePercent.mul(-1);
+    // }
+
+    const historicalDataContainer = await this.getChart({
+      dateRange,
+      impersonationId,
+      userCurrency,
+      userId
+    });
+
+    const itemOfToday = historicalDataContainer.items.find((item) => {
+      return item.date === format(new Date(), DATE_FORMAT);
+    });
+
+    if (itemOfToday) {
+      currentNetPerformance = new Big(itemOfToday.netPerformance);
+      currentNetPerformancePercent = new Big(
+        itemOfToday.netPerformanceInPercentage
+      ).div(100);
    }

    return {
+      chart: historicalDataContainer.items.map(
+        ({
+          date,
+          netPerformance,
+          netPerformanceInPercentage,
+          totalInvestment,
+          value
+        }) => {
+          return {
+            date,
+            netPerformance,
+            netPerformanceInPercentage,
+            totalInvestment,
+            value
+          };
+        }
+      ),
      errors: currentPositions.errors,
+      firstOrderDate: parseDate(historicalDataContainer.items[0]?.date),
      hasErrors: currentPositions.hasErrors || hasErrors,
      performance: {
        currentValue,
@ -982,14 +998,16 @@ export class PortfolioService {
        currentGrossPerformancePercent:
          currentGrossPerformancePercent.toNumber(),
        currentNetPerformance: currentNetPerformance.toNumber(),
-        currentNetPerformancePercent: currentNetPerformancePercent.toNumber()
+        currentNetPerformancePercent: currentNetPerformancePercent.toNumber(),
+        totalInvestment: totalInvestment.toNumber()
      }
    };
  }

  public async getReport(impersonationId: string): Promise<PortfolioReport> {
-    const currency = this.request.user.Settings.settings.baseCurrency;
    const userId = await this.getUserId(impersonationId, this.request.user.id);
+    const user = await this.userService.user({ id: userId });
+    const userCurrency = this.getUserCurrency(user);

    const { orders, portfolioOrders, transactionPoints } =
      await this.getTransactionPoints({
@ -1003,7 +1021,7 @@ export class PortfolioService {
    }

    const portfolioCalculator = new PortfolioCalculator({
-      currency,
+      currency: userCurrency,
      currentRateService: this.currentRateService,
      orders: portfolioOrders
    });
@ -1023,7 +1041,7 @@ export class PortfolioService {
      orders,
      portfolioItemsNow,
      userId,
-      userCurrency: currency
+      userCurrency
    });
    return {
      rules: {
@ -1070,7 +1088,7 @@ export class PortfolioService {
            new FeeRatioInitialInvestment(
              this.exchangeRateDataService,
              currentPositions.totalInvestment.toNumber(),
-              this.getFees(orders).toNumber()
+              this.getFees({ orders, userCurrency }).toNumber()
            )
          ],
          <UserSettings>this.request.user.Settings.settings
@ -1079,74 +1097,6 @@ export class PortfolioService {
    };
  }

-  public async getSummary(aImpersonationId: string): Promise<PortfolioSummary> {
-    const userCurrency = this.request.user.Settings.settings.baseCurrency;
-    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
-    const user = await this.userService.user({ id: userId });
-
-    const performanceInformation = await this.getPerformance(aImpersonationId);
-
-    const { balanceInBaseCurrency } = await this.accountService.getCashDetails({
-      userId,
-      currency: userCurrency
-    });
-    const orders = await this.orderService.getOrders({
-      userCurrency,
-      userId
-    });
-    const dividend = this.getDividend(orders).toNumber();
-    const emergencyFund = new Big(
-      (user.Settings?.settings as UserSettings)?.emergencyFund ?? 0
-    );
-    const fees = this.getFees(orders).toNumber();
-    const firstOrderDate = orders[0]?.date;
-    const items = this.getItems(orders).toNumber();
-
-    const totalBuy = this.getTotalByType(orders, userCurrency, 'BUY');
-    const totalSell = this.getTotalByType(orders, userCurrency, 'SELL');
-
-    const cash = new Big(balanceInBaseCurrency).minus(emergencyFund).toNumber();
-    const committedFunds = new Big(totalBuy).minus(totalSell);
-
-    const netWorth = new Big(balanceInBaseCurrency)
-      .plus(performanceInformation.performance.currentValue)
-      .plus(items)
-      .toNumber();
-
-    const daysInMarket = differenceInDays(new Date(), firstOrderDate);
-
-    const annualizedPerformancePercent = new PortfolioCalculator({
-      currency: userCurrency,
-      currentRateService: this.currentRateService,
-      orders: []
-    })
-      .getAnnualizedPerformancePercent({
-        daysInMarket,
-        netPerformancePercent: new Big(
-          performanceInformation.performance.currentNetPerformancePercent
-        )
-      })
-      ?.toNumber();
-
-    return {
-      ...performanceInformation.performance,
-      annualizedPerformancePercent,
-      cash,
-      dividend,
-      fees,
-      firstOrderDate,
-      items,
-      netWorth,
-      totalBuy,
-      totalSell,
-      committedFunds: committedFunds.toNumber(),
-      emergencyFund: emergencyFund.toNumber(),
-      ordersCount: orders.filter((order) => {
-        return order.type === 'BUY' || order.type === 'SELL';
-      }).length
-    };
-  }
-
  private async getCashPositions({
    cashDetails,
    emergencyFund,
@ -1160,7 +1110,12 @@ export class PortfolioService {
    value: Big;
    userCurrency: string;
  }) {
-    const cashPositions: PortfolioDetails['holdings'] = {};
+    const cashPositions: PortfolioDetails['holdings'] = {
+      [userCurrency]: this.getInitialCashPosition({
+        balance: 0,
+        currency: userCurrency
+      })
+    };

    for (const account of cashDetails.accounts) {
      const convertedBalance = this.exchangeRateDataService.toCurrency(
@ -1177,28 +1132,10 @@ export class PortfolioService {
        cashPositions[account.currency].investment += convertedBalance;
        cashPositions[account.currency].value += convertedBalance;
      } else {
-        cashPositions[account.currency] = {
-          allocationCurrent: 0,
-          allocationInvestment: 0,
-          assetClass: AssetClass.CASH,
-          assetSubClass: AssetClass.CASH,
-          countries: [],
-          currency: account.currency,
-          dataSource: undefined,
-          grossPerformance: 0,
-          grossPerformancePercent: 0,
-          investment: convertedBalance,
-          marketPrice: 0,
-          marketState: 'open',
-          name: account.currency,
-          netPerformance: 0,
-          netPerformancePercent: 0,
-          quantity: 0,
-          sectors: [],
-          symbol: account.currency,
-          transactionCount: 0,
-          value: convertedBalance
-        };
+        cashPositions[account.currency] = this.getInitialCashPosition({
+          balance: convertedBalance,
+          currency: account.currency
+        });
      }
    }

@ -1226,22 +1163,26 @@ export class PortfolioService {

    for (const symbol of Object.keys(cashPositions)) {
      // Calculate allocations for each currency
-      cashPositions[symbol].allocationCurrent = new Big(
-        cashPositions[symbol].value
-      )
-        .div(value)
-        .toNumber();
-      cashPositions[symbol].allocationInvestment = new Big(
-        cashPositions[symbol].investment
-      )
-        .div(investment)
-        .toNumber();
+      cashPositions[symbol].allocationCurrent = value.gt(0)
+        ? new Big(cashPositions[symbol].value).div(value).toNumber()
+        : 0;
+      cashPositions[symbol].allocationInvestment = investment.gt(0)
+        ? new Big(cashPositions[symbol].investment).div(investment).toNumber()
+        : 0;
    }

    return cashPositions;
  }

-  private getDividend(orders: OrderWithAccount[], date = new Date(0)) {
+  private getDividend({
+    date = new Date(0),
+    orders,
+    userCurrency
+  }: {
+    date?: Date;
+    orders: OrderWithAccount[];
+    userCurrency: string;
+  }) {
    return orders
      .filter((order) => {
        // Filter out all orders before given date and type dividend
@ -1254,7 +1195,7 @@ export class PortfolioService {
        return this.exchangeRateDataService.toCurrency(
          new Big(order.quantity).mul(order.unitPrice).toNumber(),
          order.SymbolProfile.currency,
-          this.request.user.Settings.settings.baseCurrency
+          userCurrency
        );
      })
      .reduce(
@ -1263,7 +1204,15 @@ export class PortfolioService {
      );
  }

-  private getFees(orders: OrderWithAccount[], date = new Date(0)) {
+  private getFees({
+    date = new Date(0),
+    orders,
+    userCurrency
+  }: {
+    date?: Date;
+    orders: OrderWithAccount[];
+    userCurrency: string;
+  }) {
    return orders
      .filter((order) => {
        // Filter out all orders before given date
@ -1273,7 +1222,7 @@ export class PortfolioService {
        return this.exchangeRateDataService.toCurrency(
          order.fee,
          order.SymbolProfile.currency,
-          this.request.user.Settings.settings.baseCurrency
+          userCurrency
        );
      })
      .reduce(
@ -1282,6 +1231,37 @@ export class PortfolioService {
      );
  }

+  private getInitialCashPosition({
+    balance,
+    currency
+  }: {
+    balance: number;
+    currency: string;
+  }): PortfolioPosition {
+    return {
+      currency,
+      allocationCurrent: 0,
+      allocationInvestment: 0,
+      assetClass: AssetClass.CASH,
+      assetSubClass: AssetClass.CASH,
+      countries: [],
+      dataSource: undefined,
+      grossPerformance: 0,
+      grossPerformancePercent: 0,
+      investment: balance,
+      marketPrice: 0,
+      marketState: 'open',
+      name: currency,
+      netPerformance: 0,
+      netPerformancePercent: 0,
+      quantity: 0,
+      sectors: [],
+      symbol: currency,
+      transactionCount: 0,
+      value: balance
+    };
+  }
+
  private getItems(orders: OrderWithAccount[], date = new Date(0)) {
    return orders
      .filter((order) => {
@ -1322,14 +1302,125 @@ export class PortfolioService {
    return portfolioStart;
  }

+  private async getSummary({
+    impersonationId,
+    userCurrency,
+    userId
+  }: {
+    impersonationId: string;
+    userCurrency: string;
+    userId: string;
+  }): Promise<PortfolioSummary> {
+    userId = await this.getUserId(impersonationId, userId);
+    const user = await this.userService.user({ id: userId });
+
+    const performanceInformation = await this.getPerformance({
+      impersonationId,
+      userId
+    });
+
+    const { balanceInBaseCurrency } = await this.accountService.getCashDetails({
+      userId,
+      currency: userCurrency
+    });
+    const orders = await this.orderService.getOrders({
+      userCurrency,
+      userId
+    });
+
+    const excludedActivities = (
+      await this.orderService.getOrders({
+        userCurrency,
+        userId,
+        withExcludedAccounts: true
+      })
+    ).filter(({ Account: account }) => {
+      return account?.isExcluded ?? false;
+    });
+
+    const dividend = this.getDividend({ orders, userCurrency }).toNumber();
+    const emergencyFund = new Big(
+      (user.Settings?.settings as UserSettings)?.emergencyFund ?? 0
+    );
+    const fees = this.getFees({ orders, userCurrency }).toNumber();
+    const firstOrderDate = orders[0]?.date;
+    const items = this.getItems(orders).toNumber();
+
+    const totalBuy = this.getTotalByType(orders, userCurrency, 'BUY');
+    const totalSell = this.getTotalByType(orders, userCurrency, 'SELL');
+
+    const cash = new Big(balanceInBaseCurrency).minus(emergencyFund).toNumber();
+    const committedFunds = new Big(totalBuy).minus(totalSell);
+    const totalOfExcludedActivities = new Big(
+      this.getTotalByType(excludedActivities, userCurrency, 'BUY')
+    ).minus(this.getTotalByType(excludedActivities, userCurrency, 'SELL'));
+
+    const cashDetailsWithExcludedAccounts =
+      await this.accountService.getCashDetails({
+        userId,
+        currency: userCurrency,
+        withExcludedAccounts: true
+      });
+
+    const excludedBalanceInBaseCurrency = new Big(
+      cashDetailsWithExcludedAccounts.balanceInBaseCurrency
+    ).minus(balanceInBaseCurrency);
+
+    const excludedAccountsAndActivities = excludedBalanceInBaseCurrency
+      .plus(totalOfExcludedActivities)
+      .toNumber();
+
+    const netWorth = new Big(balanceInBaseCurrency)
+      .plus(performanceInformation.performance.currentValue)
+      .plus(items)
+      .plus(excludedAccountsAndActivities)
+      .toNumber();
+
+    const daysInMarket = differenceInDays(new Date(), firstOrderDate);
+
+    const annualizedPerformancePercent = new PortfolioCalculator({
+      currency: userCurrency,
+      currentRateService: this.currentRateService,
+      orders: []
+    })
+      .getAnnualizedPerformancePercent({
+        daysInMarket,
+        netPerformancePercent: new Big(
+          performanceInformation.performance.currentNetPerformancePercent
+        )
+      })
+      ?.toNumber();
+
+    return {
+      ...performanceInformation.performance,
+      annualizedPerformancePercent,
+      cash,
+      dividend,
+      excludedAccountsAndActivities,
+      fees,
+      firstOrderDate,
+      items,
+      netWorth,
+      totalBuy,
+      totalSell,
+      committedFunds: committedFunds.toNumber(),
+      emergencyFund: emergencyFund.toNumber(),
+      ordersCount: orders.filter((order) => {
+        return order.type === 'BUY' || order.type === 'SELL';
+      }).length
+    };
+  }
+
  private async getTransactionPoints({
    filters,
    includeDrafts = false,
-    userId
+    userId,
+    withExcludedAccounts
  }: {
    filters?: Filter[];
    includeDrafts?: boolean;
    userId: string;
+    withExcludedAccounts?: boolean;
  }): Promise<{
    transactionPoints: TransactionPoint[];
    orders: OrderWithAccount[];
@ -1343,6 +1434,7 @@ export class PortfolioService {
      includeDrafts,
      userCurrency,
      userId,
+      withExcludedAccounts,
      types: ['BUY', 'SELL']
    });

@ -1394,17 +1486,22 @@ export class PortfolioService {
    orders,
    portfolioItemsNow,
    userCurrency,
-    userId
+    userId,
+    withExcludedAccounts
  }: {
    filters?: Filter[];
    orders: OrderWithAccount[];
    portfolioItemsNow: { [p: string]: TimelinePosition };
    userCurrency: string;
    userId: string;
+    withExcludedAccounts?: boolean;
  }) {
    const accounts: PortfolioDetails['accounts'] = {};

-    let currentAccounts = [];
+    let currentAccounts: (Account & {
+      Order?: Order[];
+      Platform?: Platform;
+    })[] = [];

    if (filters.length === 0) {
      currentAccounts = await this.accountService.getAccounts(userId);
@ -1424,6 +1521,10 @@ export class PortfolioService {
      });
    }

+    currentAccounts = currentAccounts.filter((account) => {
+      return withExcludedAccounts || account.isExcluded === false;
+    });
+
    for (const account of currentAccounts) {
      const ordersByAccount = orders.filter(({ accountId }) => {
        return accountId === account.id;
@ -1509,4 +1610,12 @@ export class PortfolioService {
      })
      .reduce((previous, current) => previous + current, 0);
  }
+
+  private getUserCurrency(aUser: UserWithSettings) {
+    return (
+      aUser.Settings?.settings.baseCurrency ??
+      this.request.user?.Settings?.settings.baseCurrency ??
+      this.baseCurrency
+    );
+  }
 }
--- a/apps/api/src/app/symbol/symbol.service.ts
+++ b/apps/api/src/app/symbol/symbol.service.ts
@ -32,7 +32,7 @@ export class SymbolService {
    ]);
    const { currency, marketPrice } = quotes[dataGatheringItem.symbol] ?? {};

-    if (dataGatheringItem.dataSource && marketPrice) {
+    if (dataGatheringItem.dataSource && marketPrice >= 0) {
      let historicalData: HistoricalDataItem[] = [];

      if (includeHistoricalData > 0) {
--- a/apps/api/src/app/user/update-user-setting.dto.ts
+++ b/apps/api/src/app/user/update-user-setting.dto.ts
@ -1,4 +1,8 @@
-import type { DateRange, ViewMode } from '@ghostfolio/common/types';
+import type {
+  ColorScheme,
+  DateRange,
+  ViewMode
+} from '@ghostfolio/common/types';
 import {
  IsBoolean,
  IsIn,
@ -16,6 +20,10 @@ export class UpdateUserSettingDto {
  @IsOptional()
  benchmark?: string;

+  @IsIn(<ColorScheme[]>['DARK', 'LIGHT'])
+  @IsOptional()
+  colorScheme?: ColorScheme;
+
  @IsIn(<DateRange[]>['1d', '1y', '5y', 'max', 'ytd'])
  @IsOptional()
  dateRange?: DateRange;
--- a/apps/api/src/services/api/api.module.ts
+++ b/apps/api/src/services/api/api.module.ts
@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+
+import { ApiService } from './api.service';
+
+@Module({
+  exports: [ApiService],
+  providers: [ApiService]
+})
+export class ApiModule {}
--- a/apps/api/src/services/api/api.service.ts
+++ b/apps/api/src/services/api/api.service.ts
@ -0,0 +1,42 @@
+import { Filter } from '@ghostfolio/common/interfaces';
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class ApiService {
+  public constructor() {}
+
+  public buildFiltersFromQueryParams({
+    filterByAccounts,
+    filterByAssetClasses,
+    filterByTags
+  }: {
+    filterByAccounts?: string;
+    filterByAssetClasses?: string;
+    filterByTags?: string;
+  }): Filter[] {
+    const accountIds = filterByAccounts?.split(',') ?? [];
+    const assetClasses = filterByAssetClasses?.split(',') ?? [];
+    const tagIds = filterByTags?.split(',') ?? [];
+
+    return [
+      ...accountIds.map((accountId) => {
+        return <Filter>{
+          id: accountId,
+          type: 'ACCOUNT'
+        };
+      }),
+      ...assetClasses.map((assetClass) => {
+        return <Filter>{
+          id: assetClass,
+          type: 'ASSET_CLASS'
+        };
+      }),
+      ...tagIds.map((tagId) => {
+        return <Filter>{
+          id: tagId,
+          type: 'TAG'
+        };
+      })
+    ];
+  }
+}
--- a/apps/api/src/services/configuration.service.ts
+++ b/apps/api/src/services/configuration.service.ts
@ -12,11 +12,14 @@ export class ConfigurationService {
    this.environmentConfiguration = cleanEnv(process.env, {
      ACCESS_TOKEN_SALT: str(),
      ALPHA_VANTAGE_API_KEY: str({ default: '' }),
-      BASE_CURRENCY: str({ default: 'USD' }),
+      BASE_CURRENCY: str({
+        choices: ['AUD', 'CAD', 'CNY', 'EUR', 'GBP', 'JPY', 'RUB', 'USD'],
+        default: 'USD'
+      }),
      CACHE_TTL: num({ default: 1 }),
      DATA_SOURCE_PRIMARY: str({ default: DataSource.YAHOO }),
      DATA_SOURCES: json({
-        default: [DataSource.GHOSTFOLIO, DataSource.YAHOO]
+        default: [DataSource.GHOSTFOLIO, DataSource.MANUAL, DataSource.YAHOO]
      }),
      ENABLE_FEATURE_BLOG: bool({ default: false }),
      ENABLE_FEATURE_CUSTOM_SYMBOLS: bool({ default: false }),
@ -38,7 +41,7 @@ export class ConfigurationService {
      MAX_ACTIVITIES_TO_IMPORT: num({ default: Number.MAX_SAFE_INTEGER }),
      MAX_ITEM_IN_CACHE: num({ default: 9999 }),
      PORT: port({ default: 3333 }),
-      RAKUTEN_RAPID_API_KEY: str({ default: '' }),
+      RAPID_API_API_KEY: str({ default: '' }),
      REDIS_HOST: host({ default: 'localhost' }),
      REDIS_PASSWORD: str({ default: '' }),
      REDIS_PORT: port({ default: 6379 }),
--- a/apps/api/src/services/data-gathering.service.ts
+++ b/apps/api/src/services/data-gathering.service.ts
@ -280,7 +280,7 @@ export class DataGatheringService {
        return (
          dataSource !== DataSource.GHOSTFOLIO &&
          dataSource !== DataSource.MANUAL &&
-          dataSource !== DataSource.RAKUTEN
+          dataSource !== DataSource.RAPID_API
        );
      })
      .map(({ dataSource, symbol }) => {
--- a/apps/api/src/services/data-provider/data-provider.module.ts
+++ b/apps/api/src/services/data-provider/data-provider.module.ts
@ -5,7 +5,7 @@ import { EodHistoricalDataService } from '@ghostfolio/api/services/data-provider
 import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service';
 import { GoogleSheetsService } from '@ghostfolio/api/services/data-provider/google-sheets/google-sheets.service';
 import { ManualService } from '@ghostfolio/api/services/data-provider/manual/manual.service';
-import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service';
+import { RapidApiService } from '@ghostfolio/api/services/data-provider/rapid-api/rapid-api.service';
 import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';
 import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
@ -27,7 +27,7 @@ import { DataProviderService } from './data-provider.service';
    GhostfolioScraperApiService,
    GoogleSheetsService,
    ManualService,
-    RakutenRapidApiService,
+    RapidApiService,
    YahooFinanceService,
    {
      inject: [
@ -36,7 +36,7 @@ import { DataProviderService } from './data-provider.service';
        GhostfolioScraperApiService,
        GoogleSheetsService,
        ManualService,
-        RakutenRapidApiService,
+        RapidApiService,
        YahooFinanceService
      ],
      provide: 'DataProviderInterfaces',
@ -46,7 +46,7 @@ import { DataProviderService } from './data-provider.service';
        ghostfolioScraperApiService,
        googleSheetsService,
        manualService,
-        rakutenRapidApiService,
+        rapidApiService,
        yahooFinanceService
      ) => [
        alphaVantageService,
@ -54,7 +54,7 @@ import { DataProviderService } from './data-provider.service';
        ghostfolioScraperApiService,
        googleSheetsService,
        manualService,
-        rakutenRapidApiService,
+        rapidApiService,
        yahooFinanceService
      ]
    }
--- a/apps/api/src/services/data-provider/manual/manual.service.ts
+++ b/apps/api/src/services/data-provider/manual/manual.service.ts
@ -4,13 +4,18 @@ import {
  IDataProviderHistoricalResponse,
  IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
+import { PrismaService } from '@ghostfolio/api/services/prisma.service';
+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
 import { Granularity } from '@ghostfolio/common/types';
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';

@Injectable()
 export class ManualService implements DataProviderInterface {
-  public constructor() {}
+  public constructor(
+    private readonly prismaService: PrismaService,
+    private readonly symbolProfileService: SymbolProfileService
+  ) {}

  public canHandle(symbol: string) {
    return false;
@ -42,10 +47,77 @@ export class ManualService implements DataProviderInterface {
  public async getQuotes(
    aSymbols: string[]
  ): Promise<{ [symbol: string]: IDataProviderResponse }> {
+    const response: { [symbol: string]: IDataProviderResponse } = {};
+
+    if (aSymbols.length <= 0) {
+      return response;
+    }
+
+    try {
+      const symbolProfiles =
+        await this.symbolProfileService.getSymbolProfilesBySymbols(aSymbols);
+
+      const marketData = await this.prismaService.marketData.findMany({
+        distinct: ['symbol'],
+        orderBy: {
+          date: 'desc'
+        },
+        take: aSymbols.length,
+        where: {
+          symbol: {
+            in: aSymbols
+          }
+        }
+      });
+
+      for (const symbolProfile of symbolProfiles) {
+        response[symbolProfile.symbol] = {
+          currency: symbolProfile.currency,
+          dataSource: this.getName(),
+          marketPrice:
+            marketData.find((marketDataItem) => {
+              return marketDataItem.symbol === symbolProfile.symbol;
+            })?.marketPrice ?? 0,
+          marketState: 'delayed'
+        };
+      }
+
+      return response;
+    } catch (error) {
+      Logger.error(error, 'ManualService');
+    }
+
    return {};
  }

  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
-    return { items: [] };
+    const items = await this.prismaService.symbolProfile.findMany({
+      select: {
+        currency: true,
+        dataSource: true,
+        name: true,
+        symbol: true
+      },
+      where: {
+        OR: [
+          {
+            dataSource: this.getName(),
+            name: {
+              mode: 'insensitive',
+              startsWith: aQuery
+            }
+          },
+          {
+            dataSource: this.getName(),
+            symbol: {
+              mode: 'insensitive',
+              startsWith: aQuery
+            }
+          }
+        ]
+      }
+    });
+
+    return { items };
  }
 }
--- a/apps/api/src/services/data-provider/rakuten-rapid-api/interfaces/interfaces.ts
+++ b/apps/api/src/services/data-provider/rakuten-rapid-api/interfaces/interfaces.ts
@ -1 +0,0 @@
-export interface IRakutenRapidApiResponse {}
--- a/apps/api/src/services/data-provider/rapid-api/interfaces/interfaces.ts
+++ b/apps/api/src/services/data-provider/rapid-api/interfaces/interfaces.ts
@ -0,0 +1 @@
+export interface IRapidApiResponse {}
--- a/apps/api/src/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service.ts
+++ b/apps/api/src/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service.ts
@ -15,14 +15,14 @@ import bent from 'bent';
 import { format, subMonths, subWeeks, subYears } from 'date-fns';

@Injectable()
-export class RakutenRapidApiService implements DataProviderInterface {
+export class RapidApiService implements DataProviderInterface {
  public constructor(
    private readonly configurationService: ConfigurationService,
    private readonly prismaService: PrismaService
  ) {}

  public canHandle(symbol: string) {
-    return !!this.configurationService.get('RAKUTEN_RAPID_API_KEY');
+    return !!this.configurationService.get('RAPID_API_API_KEY');
  }

  public async getAssetProfile(
@ -103,7 +103,7 @@ export class RakutenRapidApiService implements DataProviderInterface {
  }

  public getName(): DataSource {
-    return DataSource.RAKUTEN;
+    return DataSource.RAPID_API;
  }

  public async getQuotes(
@ -129,7 +129,7 @@ export class RakutenRapidApiService implements DataProviderInterface {
        };
      }
    } catch (error) {
-      Logger.error(error, 'RakutenRapidApiService');
+      Logger.error(error, 'RapidApiService');
    }

    return {};
@ -155,16 +155,14 @@ export class RakutenRapidApiService implements DataProviderInterface {
        {
          useQueryString: true,
          'x-rapidapi-host': 'fear-and-greed-index.p.rapidapi.com',
-          'x-rapidapi-key': this.configurationService.get(
-            'RAKUTEN_RAPID_API_KEY'
-          )
+          'x-rapidapi-key': this.configurationService.get('RAPID_API_API_KEY')
        }
      );

      const { fgi } = await get();
      return fgi;
    } catch (error) {
-      Logger.error(error, 'RakutenRapidApiService');
+      Logger.error(error, 'RapidApiService');

      return undefined;
    }
--- a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
+++ b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
@ -6,6 +6,7 @@ import {
  IDataProviderHistoricalResponse,
  IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
+import { UNKNOWN_KEY } from '@ghostfolio/common/config';
 import { DATE_FORMAT, isCurrency } from '@ghostfolio/common/helper';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
@ -57,8 +58,15 @@ export class YahooFinanceService implements DataProviderInterface {
   *                  DOGEUSD -> DOGE-USD
   */
  public convertToYahooFinanceSymbol(aSymbol: string) {
-    if (aSymbol.includes(this.baseCurrency) && aSymbol.length >= 6) {
-      if (isCurrency(aSymbol.substring(0, aSymbol.length - 3))) {
+    if (
+      aSymbol.includes(this.baseCurrency) &&
+      aSymbol.length > this.baseCurrency.length
+    ) {
+      if (
+        isCurrency(
+          aSymbol.substring(0, aSymbol.length - this.baseCurrency.length)
+        )
+      ) {
        return `${aSymbol}=X`;
      } else if (
        this.cryptocurrencyService.isCryptocurrency(
@ -90,7 +98,7 @@ export class YahooFinanceService implements DataProviderInterface {
    try {
      const symbol = this.convertToYahooFinanceSymbol(aSymbol);
      const assetProfile = await yahooFinance.quoteSummary(symbol, {
-        modules: ['price', 'summaryProfile']
+        modules: ['price', 'summaryProfile', 'topHoldings']
      });

      const { assetClass, assetSubClass } = this.parseAssetClass(
@ -109,7 +117,16 @@ export class YahooFinanceService implements DataProviderInterface {
      });
      response.symbol = aSymbol;

-      if (
+      if (assetSubClass === AssetSubClass.MUTUALFUND) {
+        response.sectors = [];
+
+        for (const sectorWeighting of assetProfile.topHoldings
+          ?.sectorWeightings ?? []) {
+          for (const [sector, weight] of Object.entries(sectorWeighting)) {
+            response.sectors.push({ weight, name: this.parseSector(sector) });
+          }
+        }
+      } else if (
        assetSubClass === AssetSubClass.STOCK &&
        assetProfile.summaryProfile?.country
      ) {
@ -437,4 +454,46 @@ export class YahooFinanceService implements DataProviderInterface {

    return { assetClass, assetSubClass };
  }
+
+  private parseSector(aString: string): string {
+    let sector = UNKNOWN_KEY;
+
+    switch (aString) {
+      case 'basic_materials':
+        sector = 'Basic Materials';
+        break;
+      case 'communication_services':
+        sector = 'Communication Services';
+        break;
+      case 'consumer_cyclical':
+        sector = 'Consumer Cyclical';
+        break;
+      case 'consumer_defensive':
+        sector = 'Consumer Staples';
+        break;
+      case 'energy':
+        sector = 'Energy';
+        break;
+      case 'financial_services':
+        sector = 'Financial Services';
+        break;
+      case 'healthcare':
+        sector = 'Healthcare';
+        break;
+      case 'industrials':
+        sector = 'Industrials';
+        break;
+      case 'realestate':
+        sector = 'Real Estate';
+        break;
+      case 'technology':
+        sector = 'Technology';
+        break;
+      case 'utilities':
+        sector = 'Utilities';
+        break;
+    }
+
+    return sector;
+  }
 }
--- a/apps/api/src/services/interfaces/environment.interface.ts
+++ b/apps/api/src/services/interfaces/environment.interface.ts
@ -26,7 +26,7 @@ export interface Environment extends CleanedEnvAccessors {
  MAX_ACTIVITIES_TO_IMPORT: number;
  MAX_ITEM_IN_CACHE: number;
  PORT: number;
-  RAKUTEN_RAPID_API_KEY: string;
+  RAPID_API_API_KEY: string;
  REDIS_HOST: string;
  REDIS_PASSWORD: string;
  REDIS_PORT: number;
--- a/apps/api/src/services/property/property.dto.ts
+++ b/apps/api/src/services/property/property.dto.ts
@ -1,6 +1,7 @@
-import { IsString } from 'class-validator';
+import { IsOptional, IsString } from 'class-validator';

 export class PropertyDto {
+  @IsOptional()
  @IsString()
  value: string;
 }
--- a/apps/api/src/services/twitter-bot/twitter-bot.service.ts
+++ b/apps/api/src/services/twitter-bot/twitter-bot.service.ts
@ -53,13 +53,15 @@ export class TwitterBotService {
          symbolItem.marketPrice
        );

-        let status = `Current Market Mood: ${emoji} ${text} (${symbolItem.marketPrice}/100)`;
+        let status = `Current market mood is ${emoji} ${text.toLowerCase()} (${
+          symbolItem.marketPrice
+        }/100)`;

        const benchmarkListing = await this.getBenchmarkListing(3);

        if (benchmarkListing?.length > 1) {
          status += '\n\n';
-          status += '±% from ATH\n';
+          status += '± from ATH in %\n';
          status += benchmarkListing;
        }

--- a/apps/client-e2e/project.json
+++ b/apps/client-e2e/project.json
@ -0,0 +1,23 @@
+{
+  "name": "client-e2e",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "apps/client-e2e/src",
+  "projectType": "application",
+  "targets": {
+    "e2e": {
+      "executor": "@nrwl/cypress:cypress",
+      "options": {
+        "cypressConfig": "apps/client-e2e/cypress.json",
+        "tsConfig": "apps/client-e2e/tsconfig.e2e.json",
+        "devServerTarget": "client:serve"
+      },
+      "configurations": {
+        "production": {
+          "devServerTarget": "client:serve:production"
+        }
+      }
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["client"]
+}
--- a/apps/client/ngsw-config.json
+++ b/apps/client/ngsw-config.json
@ -0,0 +1,30 @@
+{
+  "$schema": "../../node_modules/@angular/service-worker/config/schema.json",
+  "index": "/index.html",
+  "assetGroups": [
+    {
+      "name": "app",
+      "installMode": "prefetch",
+      "resources": {
+        "files": [
+          "/favicon.ico",
+          "/index.html",
+          "/assets/site.webmanifest",
+          "/*.css",
+          "/*.js"
+        ]
+      }
+    },
+    {
+      "name": "assets",
+      "installMode": "lazy",
+      "updateMode": "prefetch",
+      "resources": {
+        "files": [
+          "/assets/**",
+          "/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2)"
+        ]
+      }
+    }
+  ]
+}
--- a/apps/client/project.json
+++ b/apps/client/project.json
@ -0,0 +1,209 @@
+{
+  "name": "client",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
+  "generators": {
+    "@schematics/angular:component": {
+      "style": "scss"
+    }
+  },
+  "sourceRoot": "apps/client/src",
+  "prefix": "gf",
+  "targets": {
+    "build": {
+      "executor": "@angular-devkit/build-angular:browser",
+      "options": {
+        "outputPath": "dist/apps/client",
+        "index": "apps/client/src/index.html",
+        "main": "apps/client/src/main.ts",
+        "polyfills": "apps/client/src/polyfills.ts",
+        "tsConfig": "apps/client/tsconfig.app.json",
+        "assets": [
+          {
+            "glob": "assetlinks.json",
+            "input": "apps/client/src/assets",
+            "output": "./../.well-known"
+          },
+          {
+            "glob": "CHANGELOG.md",
+            "input": "",
+            "output": "./../assets"
+          },
+          {
+            "glob": "LICENSE",
+            "input": "",
+            "output": "./../assets"
+          },
+          {
+            "glob": "robots.txt",
+            "input": "apps/client/src/assets",
+            "output": "./../"
+          },
+          {
+            "glob": "sitemap.xml",
+            "input": "apps/client/src/assets",
+            "output": "./../"
+          },
+          {
+            "glob": "site.webmanifest",
+            "input": "apps/client/src/assets",
+            "output": "./../"
+          },
+          {
+            "glob": "**/*",
+            "input": "node_modules/ionicons/dist/ionicons",
+            "output": "./../ionicons"
+          },
+          {
+            "glob": "**/*.js",
+            "input": "node_modules/ionicons/dist/",
+            "output": "./../"
+          },
+          {
+            "glob": "**/*",
+            "input": "apps/client/src/assets",
+            "output": "./../assets/"
+          }
+        ],
+        "styles": ["apps/client/src/styles.scss"],
+        "scripts": ["node_modules/marked/marked.min.js"],
+        "vendorChunk": true,
+        "extractLicenses": false,
+        "buildOptimizer": false,
+        "sourceMap": true,
+        "optimization": false,
+        "namedChunks": true,
+        "serviceWorker": true,
+        "ngswConfigPath": "apps/client/ngsw-config.json"
+      },
+      "configurations": {
+        "development-de": {
+          "baseHref": "/de/",
+          "localize": ["de"]
+        },
+        "development-en": {
+          "baseHref": "/en/",
+          "localize": ["en"]
+        },
+        "development-es": {
+          "baseHref": "/es/",
+          "localize": ["es"]
+        },
+        "development-it": {
+          "baseHref": "/it/",
+          "localize": ["it"]
+        },
+        "development-nl": {
+          "baseHref": "/nl/",
+          "localize": ["nl"]
+        },
+        "production": {
+          "fileReplacements": [
+            {
+              "replace": "apps/client/src/environments/environment.ts",
+              "with": "apps/client/src/environments/environment.prod.ts"
+            }
+          ],
+          "optimization": true,
+          "outputHashing": "all",
+          "sourceMap": false,
+          "namedChunks": false,
+          "extractLicenses": true,
+          "vendorChunk": false,
+          "buildOptimizer": true,
+          "budgets": [
+            {
+              "type": "initial",
+              "maximumWarning": "2mb",
+              "maximumError": "5mb"
+            },
+            {
+              "type": "anyComponentStyle",
+              "maximumWarning": "6kb",
+              "maximumError": "10kb"
+            }
+          ]
+        }
+      },
+      "outputs": ["{options.outputPath}"],
+      "defaultConfiguration": ""
+    },
+    "serve": {
+      "executor": "@angular-devkit/build-angular:dev-server",
+      "options": {
+        "browserTarget": "client:build",
+        "proxyConfig": "apps/client/proxy.conf.json"
+      },
+      "configurations": {
+        "development-de": {
+          "browserTarget": "client:build:development-de"
+        },
+        "development-en": {
+          "browserTarget": "client:build:development-en"
+        },
+        "development-es": {
+          "browserTarget": "client:build:development-es"
+        },
+        "development-it": {
+          "browserTarget": "client:build:development-it"
+        },
+        "development-nl": {
+          "browserTarget": "client:build:development-nl"
+        },
+        "production": {
+          "browserTarget": "client:build:production"
+        }
+      }
+    },
+    "extract-i18n": {
+      "executor": "ng-extract-i18n-merge:ng-extract-i18n-merge",
+      "options": {
+        "browserTarget": "client:build",
+        "includeContext": true,
+        "outputPath": "src/locales",
+        "targetFiles": [
+          "messages.de.xlf",
+          "messages.es.xlf",
+          "messages.it.xlf",
+          "messages.nl.xlf"
+        ]
+      }
+    },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "options": {
+        "lintFilePatterns": ["apps/client/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "@nrwl/jest:jest",
+      "options": {
+        "jestConfig": "apps/client/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "outputs": ["{workspaceRoot}/coverage/apps/client"]
+    }
+  },
+  "i18n": {
+    "locales": {
+      "de": {
+        "baseHref": "/de/",
+        "translation": "apps/client/src/locales/messages.de.xlf"
+      },
+      "es": {
+        "baseHref": "/es/",
+        "translation": "apps/client/src/locales/messages.es.xlf"
+      },
+      "it": {
+        "baseHref": "/it/",
+        "translation": "apps/client/src/locales/messages.it.xlf"
+      },
+      "nl": {
+        "baseHref": "/nl/",
+        "translation": "apps/client/src/locales/messages.nl.xlf"
+      }
+    },
+    "sourceLocale": "en"
+  },
+  "tags": []
+}
--- a/apps/client/src/app/app-routing.module.ts
+++ b/apps/client/src/app/app-routing.module.ts
@ -95,6 +95,20 @@ const routes: Routes = [
        './pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.module'
      ).then((m) => m.FiveHundredStarsOnGitHubPageModule)
  },
+  {
+    path: 'blog/2022/10/hacktoberfest-2022',
+    loadChildren: () =>
+      import(
+        './pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.module'
+      ).then((m) => m.Hacktoberfest2022PageModule)
+  },
+  {
+    path: 'blog/2022/11/black-friday-2022',
+    loadChildren: () =>
+      import(
+        './pages/blog/2022/11/black-friday-2022/black-friday-2022-page.module'
+      ).then((m) => m.BlackFriday2022PageModule)
+  },
  {
    path: 'demo',
    loadChildren: () =>
@ -138,48 +152,6 @@ const routes: Routes = [
        (m) => m.PortfolioPageModule
      )
  },
-  {
-    path: 'portfolio/activities',
-    loadChildren: () =>
-      import('./pages/portfolio/transactions/transactions-page.module').then(
-        (m) => m.TransactionsPageModule
-      )
-  },
-  {
-    path: 'portfolio/allocations',
-    loadChildren: () =>
-      import('./pages/portfolio/allocations/allocations-page.module').then(
-        (m) => m.AllocationsPageModule
-      )
-  },
-  {
-    path: 'portfolio/analysis',
-    loadChildren: () =>
-      import('./pages/portfolio/analysis/analysis-page.module').then(
-        (m) => m.AnalysisPageModule
-      )
-  },
-  {
-    path: 'portfolio/fire',
-    loadChildren: () =>
-      import('./pages/portfolio/fire/fire-page.module').then(
-        (m) => m.FirePageModule
-      )
-  },
-  {
-    path: 'portfolio/holdings',
-    loadChildren: () =>
-      import('./pages/portfolio/holdings/holdings-page.module').then(
-        (m) => m.HoldingsPageModule
-      )
-  },
-  {
-    path: 'portfolio/report',
-    loadChildren: () =>
-      import('./pages/portfolio/report/report-page.module').then(
-        (m) => m.ReportPageModule
-      )
-  },
  {
    path: 'pricing',
    loadChildren: () =>
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@ -13,6 +13,7 @@ import {
 } from '@ghostfolio/common/config';
 import { InfoItem, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import { ColorScheme } from '@ghostfolio/common/types';
 import { MaterialCssVarsService } from 'angular-material-css-vars';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { Subject } from 'rxjs';
@ -77,6 +78,8 @@ export class AppComponent implements OnDestroy, OnInit {
          permissions.createUserAccount
        );

+        this.initializeTheme(this.user?.settings.colorScheme);
+
        this.changeDetectorRef.markForCheck();
      });
  }
@ -97,13 +100,17 @@ export class AppComponent implements OnDestroy, OnInit {
    this.unsubscribeSubject.complete();
  }

-  private initializeTheme() {
-    this.materialCssVarsService.setDarkTheme(
-      window.matchMedia('(prefers-color-scheme: dark)').matches
-    );
+  private initializeTheme(userPreferredColorScheme?: ColorScheme) {
+    const isDarkTheme = userPreferredColorScheme
+      ? userPreferredColorScheme === 'DARK'
+      : window.matchMedia('(prefers-color-scheme: dark)').matches;
+
+    this.materialCssVarsService.setDarkTheme(isDarkTheme);

    window.matchMedia('(prefers-color-scheme: dark)').addListener((event) => {
-      this.materialCssVarsService.setDarkTheme(event.matches);
+      if (!this.user?.settings.colorScheme) {
+        this.materialCssVarsService.setDarkTheme(event.matches);
+      }
    });

    this.materialCssVarsService.setPrimaryColor(primaryColorHex);
--- a/apps/client/src/app/app.module.ts
+++ b/apps/client/src/app/app.module.ts
@ -10,6 +10,7 @@ import {
  MatNativeDateModule
 } from '@angular/material/core';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatTooltipModule } from '@angular/material/tooltip';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MaterialCssVarsModule } from 'angular-material-css-vars';
@ -26,6 +27,7 @@ import { GfHeaderModule } from './components/header/header.module';
 import { authInterceptorProviders } from './core/auth.interceptor';
 import { httpResponseInterceptorProviders } from './core/http-response.interceptor';
 import { LanguageService } from './core/language.service';
+import { ServiceWorkerModule } from '@angular/service-worker';

 export function NgxStripeFactory(): string {
  return environment.stripePublicKey;
@ -49,8 +51,13 @@ export function NgxStripeFactory(): string {
    }),
    MatNativeDateModule,
    MatSnackBarModule,
+    MatTooltipModule,
    NgxSkeletonLoaderModule,
-    NgxStripeModule.forRoot(environment.stripePublicKey)
+    NgxStripeModule.forRoot(environment.stripePublicKey),
+    ServiceWorkerModule.register('ngsw-worker.js', {
+      enabled: environment.production,
+      registrationStrategy: 'registerImmediately'
+    })
  ],
  providers: [
    authInterceptorProviders,
--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts
@ -61,7 +61,7 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
      .subscribe(({ accountType, name, Platform, valueInBaseCurrency }) => {
        this.accountType = accountType;
        this.name = name;
-        this.platformName = Platform?.name;
+        this.platformName = Platform?.name ?? '-';
        this.valueInBaseCurrency = valueInBaseCurrency;

        this.changeDetectorRef.markForCheck();
--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
@ -21,10 +21,12 @@

    <div class="row">
      <div class="col-6 mb-3">
-        <gf-value size="medium" [value]="accountType">Account Type</gf-value>
+        <gf-value i18n size="medium" [value]="accountType"
+          >Account Type</gf-value
+        >
      </div>
      <div class="col-6 mb-3">
-        <gf-value size="medium" [value]="platformName">Platform</gf-value>
+        <gf-value i18n size="medium" [value]="platformName">Platform</gf-value>
      </div>
    </div>

--- a/apps/client/src/app/components/accounts-table/accounts-table.component.html
+++ b/apps/client/src/app/components/accounts-table/accounts-table.component.html
@ -1,4 +1,22 @@
-<table class="gf-table w-100" mat-table [dataSource]="dataSource">
+<table class="gf-table w-100" mat-table matSort [dataSource]="dataSource">
+  <ng-container matColumnDef="status">
+    <th
+      *matHeaderCellDef
+      class="d-none d-lg-table-cell px-1"
+      mat-header-cell
+    ></th>
+    <td *matCellDef="let element" class="d-none d-lg-table-cell px-1" mat-cell>
+      <div class="d-flex justify-content-center">
+        <ion-icon *ngIf="element.isExcluded" name="eye-off-outline"></ion-icon>
+      </div>
+    </td>
+    <td
+      *matFooterCellDef
+      class="d-none d-lg-table-cell px-1"
+      mat-footer-cell
+    ></td>
+  </ng-container>
+
  <ng-container matColumnDef="account">
    <th *matHeaderCellDef class="px-1" i18n mat-header-cell>Name</th>
    <td *matCellDef="let element" class="px-1" mat-cell>
@ -15,11 +33,16 @@
        >(Default)</span
      >
    </td>
-    <td *matFooterCellDef class="px-1" mat-footer-cell i18n>Total</td>
+    <td *matFooterCellDef class="px-1" i18n mat-footer-cell>Total</td>
  </ng-container>

  <ng-container matColumnDef="currency">
-    <th *matHeaderCellDef class="d-none d-lg-table-cell px-1" mat-header-cell>
+    <th
+      *matHeaderCellDef
+      class="d-none d-lg-table-cell px-1"
+      mat-header-cell
+      mat-sort-header
+    >
      <ng-container i18n>Currency</ng-container>
    </th>
    <td *matCellDef="let element" class="d-none d-lg-table-cell px-1" mat-cell>
@ -70,8 +93,9 @@
  <ng-container matColumnDef="balance">
    <th
      *matHeaderCellDef
-      class="d-none d-lg-table-cell px-1 text-right"
+      class="d-none d-lg-table-cell justify-content-end px-1"
      mat-header-cell
+      mat-sort-header
    >
      <ng-container i18n>Cash Balance</ng-container>
    </th>
@ -104,8 +128,9 @@
  <ng-container matColumnDef="value">
    <th
      *matHeaderCellDef
-      class="d-none d-lg-table-cell px-1 text-right"
+      class="d-none d-lg-table-cell justify-content-end px-1"
      mat-header-cell
+      mat-sort-header
    >
      <ng-container i18n>Value</ng-container>
    </th>
@ -140,6 +165,7 @@
      *matHeaderCellDef
      class="d-lg-none d-xl-none px-1 text-right"
      mat-header-cell
+      mat-sort-header
    >
      <ng-container i18n>Value</ng-container>
    </th>
--- a/apps/client/src/app/components/accounts-table/accounts-table.component.ts
+++ b/apps/client/src/app/components/accounts-table/accounts-table.component.ts
@ -6,8 +6,10 @@ import {
  OnChanges,
  OnDestroy,
  OnInit,
-  Output
+  Output,
+  ViewChild
 } from '@angular/core';
+import { MatSort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { Router } from '@angular/router';
 import { Account as AccountModel } from '@prisma/client';
@ -32,6 +34,8 @@ export class AccountsTableComponent implements OnChanges, OnDestroy, OnInit {
  @Output() accountDeleted = new EventEmitter<string>();
  @Output() accountToUpdate = new EventEmitter<AccountModel>();

+  @ViewChild(MatSort) sort: MatSort;
+
  public dataSource: MatTableDataSource<AccountModel> =
    new MatTableDataSource();
  public displayedColumns = [];
@ -46,6 +50,7 @@ export class AccountsTableComponent implements OnChanges, OnDestroy, OnInit {

  public ngOnChanges() {
    this.displayedColumns = [
+      'status',
      'account',
      'platform',
      'transactions',
@ -63,6 +68,7 @@ export class AccountsTableComponent implements OnChanges, OnDestroy, OnInit {

    if (this.accounts) {
      this.dataSource = new MatTableDataSource(this.accounts);
+      this.dataSource.sort = this.sort;

      this.isLoading = false;
    }
--- a/apps/client/src/app/components/accounts-table/accounts-table.module.ts
+++ b/apps/client/src/app/components/accounts-table/accounts-table.module.ts
@ -3,6 +3,7 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatInputModule } from '@angular/material/input';
 import { MatMenuModule } from '@angular/material/menu';
+import { MatSortModule } from '@angular/material/sort';
 import { MatTableModule } from '@angular/material/table';
 import { RouterModule } from '@angular/router';
 import { GfSymbolIconModule } from '@ghostfolio/client/components/symbol-icon/symbol-icon.module';
@ -21,6 +22,7 @@ import { AccountsTableComponent } from './accounts-table.component';
    MatButtonModule,
    MatInputModule,
    MatMenuModule,
+    MatSortModule,
    MatTableModule,
    NgxSkeletonLoaderModule,
    RouterModule
--- a/apps/client/src/app/components/admin-jobs/admin-jobs.html
+++ b/apps/client/src/app/components/admin-jobs/admin-jobs.html
@ -2,7 +2,10 @@
  <div class="row">
    <div class="col">
      <form class="align-items-center d-flex" [formGroup]="filterForm">
-        <mat-form-field appearance="outline" class="flex-grow-1">
+        <mat-form-field
+          appearance="outline"
+          class="compact-with-outline without-hint w-100"
+        >
          <mat-select formControlName="status">
            <mat-option></mat-option>
            <mat-option
@ -12,14 +15,6 @@
            >
          </mat-select>
        </mat-form-field>
-        <button
-          class="ml-1"
-          color="warn"
-          mat-flat-button
-          (click)="onDeleteJobs()"
-        >
-          <span i18n>Delete Jobs</span>
-        </button>
      </form>
      <table class="gf-table w-100">
        <thead>
@ -32,7 +27,21 @@
            <th class="mat-header-cell px-1 py-2" i18n>Created</th>
            <th class="mat-header-cell px-1 py-2" i18n>Finished</th>
            <th class="mat-header-cell px-1 py-2" i18n>Status</th>
-            <th class="mat-header-cell px-1 py-2"></th>
+            <th class="mat-header-cell px-1 py-2">
+              <button
+                class="mx-1 no-min-width px-2"
+                mat-button
+                [matMenuTriggerFor]="jobsActionsMenu"
+                (click)="$event.stopPropagation()"
+              >
+                <ion-icon name="ellipsis-vertical"></ion-icon>
+              </button>
+              <mat-menu #jobsActionsMenu="matMenu" xPosition="before">
+                <button mat-menu-item (click)="onDeleteJobs()">
+                  <ng-container i18n>Delete Jobs</ng-container>
+                </button>
+              </mat-menu>
+            </th>
          </tr>
        </thead>
        <tbody>
@ -99,12 +108,12 @@
                <button
                  class="mx-1 no-min-width px-2"
                  mat-button
-                  [matMenuTriggerFor]="accountMenu"
+                  [matMenuTriggerFor]="jobActionsMenu"
                  (click)="$event.stopPropagation()"
                >
                  <ion-icon name="ellipsis-vertical"></ion-icon>
                </button>
-                <mat-menu #accountMenu="matMenu" xPosition="before">
+                <mat-menu #jobActionsMenu="matMenu" xPosition="before">
                  <button mat-menu-item (click)="onViewData(job.data)">
                    <ng-container i18n>View Data</ng-container>
                  </button>
--- a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.html
+++ b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.html
@ -2,6 +2,7 @@
  <gf-line-chart
    class="mb-4"
    [historicalDataItems]="historicalDataItems"
+    [isAnimated]="true"
    [locale]="locale"
    [showXAxis]="true"
    [showYAxis]="true"
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
@ -150,6 +150,35 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
      .subscribe(() => {});
  }

+  public onGather7Days() {
+    this.adminService
+      .gather7Days()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(() => {
+        setTimeout(() => {
+          window.location.reload();
+        }, 300);
+      });
+  }
+
+  public onGatherMax() {
+    this.adminService
+      .gatherMax()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(() => {
+        setTimeout(() => {
+          window.location.reload();
+        }, 300);
+      });
+  }
+
+  public onGatherProfileData() {
+    this.adminService
+      .gatherProfileData()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(() => {});
+  }
+
  public onGatherProfileDataBySymbol({ dataSource, symbol }: UniqueAsset) {
    this.adminService
      .gatherProfileDataBySymbol({ dataSource, symbol })
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.html
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.html
@ -13,10 +13,10 @@
    <div class="col">
      <table
        class="gf-table w-100"
+        mat-table
        matSort
        matSortActive="symbol"
        matSortDirection="asc"
-        mat-table
        [dataSource]="dataSource"
      >
        <ng-container matColumnDef="symbol">
@ -101,17 +101,37 @@
        </ng-container>

        <ng-container matColumnDef="actions">
-          <th *matHeaderCellDef class="px-1 text-center" mat-header-cell></th>
-          <td *matCellDef="let element" class="px-1 text-center" mat-cell>
+          <th *matHeaderCellDef class="px-1 text-center" mat-header-cell>
            <button
              class="mx-1 no-min-width px-2"
              mat-button
-              [matMenuTriggerFor]="accountMenu"
+              [matMenuTriggerFor]="assetProfilesActionsMenu"
              (click)="$event.stopPropagation()"
            >
              <ion-icon name="ellipsis-vertical"></ion-icon>
            </button>
-            <mat-menu #accountMenu="matMenu" xPosition="before">
+            <mat-menu #assetProfilesActionsMenu="matMenu" xPosition="before">
+              <button mat-menu-item (click)="onGather7Days()">
+                <ng-container i18n>Gather Recent Data</ng-container>
+              </button>
+              <button mat-menu-item (click)="onGatherMax()">
+                <ng-container i18n>Gather All Data</ng-container>
+              </button>
+              <button mat-menu-item (click)="onGatherProfileData()">
+                <ng-container i18n>Gather Profile Data</ng-container>
+              </button>
+            </mat-menu>
+          </th>
+          <td *matCellDef="let element" class="px-1 text-center" mat-cell>
+            <button
+              class="mx-1 no-min-width px-2"
+              mat-button
+              [matMenuTriggerFor]="assetProfileActionsMenu"
+              (click)="$event.stopPropagation()"
+            >
+              <ion-icon name="ellipsis-vertical"></ion-icon>
+            </button>
+            <mat-menu #assetProfileActionsMenu="matMenu" xPosition="before">
              <button
                mat-menu-item
                (click)="onGatherSymbol({dataSource: element.dataSource, symbol: element.symbol})"
--- a/apps/client/src/app/components/admin-overview/admin-overview.component.ts
+++ b/apps/client/src/app/components/admin-overview/admin-overview.component.ts
@ -1,6 +1,5 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { MatSlideToggleChange } from '@angular/material/slide-toggle';
-import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { CacheService } from '@ghostfolio/client/services/cache.service';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
@ -43,7 +42,6 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
  private unsubscribeSubject = new Subject<void>();

  public constructor(
-    private adminService: AdminService,
    private cacheService: CacheService,
    private changeDetectorRef: ChangeDetectorRef,
    private dataService: DataService,
@ -99,7 +97,7 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
      ...this.coupons,
      { code: this.generateCouponCode(16), duration: this.couponDuration }
    ];
-    this.putCoupons(coupons);
+    this.putAdminSetting({ key: PROPERTY_COUPONS, value: coupons });
  }

  public onAddCurrency() {
@ -107,7 +105,7 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {

    if (currency) {
      const currencies = uniq([...this.customCurrencies, currency]);
-      this.putCurrencies(currencies);
+      this.putAdminSetting({ key: PROPERTY_CURRENCIES, value: currencies });
    }
  }

@ -124,7 +122,7 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
      const coupons = this.coupons.filter((coupon) => {
        return coupon.code !== aCouponCode;
      });
-      this.putCoupons(coupons);
+      this.putAdminSetting({ key: PROPERTY_COUPONS, value: coupons });
    }
  }

@ -137,12 +135,12 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
      const currencies = this.customCurrencies.filter((currency) => {
        return currency !== aCurrency;
      });
-      this.putCurrencies(currencies);
+      this.putAdminSetting({ key: PROPERTY_CURRENCIES, value: currencies });
    }
  }

  public onDeleteSystemMessage() {
-    this.putSystemMessage('');
+    this.putAdminSetting({ key: PROPERTY_SYSTEM_MESSAGE, value: undefined });
  }

  public onFlushCache() {
@ -162,44 +160,21 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
    }
  }

-  public onGather7Days() {
-    this.adminService
-      .gather7Days()
-      .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe(() => {
-        setTimeout(() => {
-          window.location.reload();
-        }, 300);
-      });
-  }
-
-  public onGatherMax() {
-    this.adminService
-      .gatherMax()
-      .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe(() => {
-        setTimeout(() => {
-          window.location.reload();
-        }, 300);
-      });
-  }
-
-  public onGatherProfileData() {
-    this.adminService
-      .gatherProfileData()
-      .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe(() => {});
-  }
-
  public onReadOnlyModeChange(aEvent: MatSlideToggleChange) {
-    this.setReadOnlyMode(aEvent.checked);
+    this.putAdminSetting({
+      key: PROPERTY_IS_READ_ONLY_MODE,
+      value: aEvent.checked ? true : undefined
+    });
  }

  public onSetSystemMessage() {
    const systemMessage = prompt($localize`Please set your system message:`);

    if (systemMessage) {
-      this.putSystemMessage(systemMessage);
+      this.putAdminSetting({
+        key: PROPERTY_SYSTEM_MESSAGE,
+        value: systemMessage
+      });
    }
  }

@ -236,49 +211,10 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
    return couponCode;
  }

-  private putCoupons(aCoupons: Coupon[]) {
+  private putAdminSetting({ key, value }: { key: string; value: any }) {
    this.dataService
-      .putAdminSetting(PROPERTY_COUPONS, {
-        value: JSON.stringify(aCoupons)
-      })
-      .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe(() => {
-        setTimeout(() => {
-          window.location.reload();
-        }, 300);
-      });
-  }
-
-  private putCurrencies(aCurrencies: string[]) {
-    this.dataService
-      .putAdminSetting(PROPERTY_CURRENCIES, {
-        value: JSON.stringify(aCurrencies)
-      })
-      .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe(() => {
-        setTimeout(() => {
-          window.location.reload();
-        }, 300);
-      });
-  }
-
-  private putSystemMessage(aSystemMessage: string) {
-    this.dataService
-      .putAdminSetting(PROPERTY_SYSTEM_MESSAGE, {
-        value: aSystemMessage
-      })
-      .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe(() => {
-        setTimeout(() => {
-          window.location.reload();
-        }, 300);
-      });
-  }
-
-  private setReadOnlyMode(aValue: boolean) {
-    this.dataService
-      .putAdminSetting(PROPERTY_IS_READ_ONLY_MODE, {
-        value: aValue ? 'true' : ''
+      .putAdminSetting(key, {
+        value: value ? JSON.stringify(value) : undefined
      })
      .pipe(takeUntil(this.unsubscribeSubject))
      .subscribe(() => {
--- a/apps/client/src/app/components/admin-overview/admin-overview.html
+++ b/apps/client/src/app/components/admin-overview/admin-overview.html
@ -5,61 +5,25 @@
        <mat-card-content>
          <div class="d-flex my-3">
            <div class="w-50" i18n>User Count</div>
-            <div class="w-50">{{ userCount }}</div>
+            <div class="w-50">
+              <gf-value
+                precision="0"
+                [locale]="user?.settings?.locale"
+                [value]="userCount"
+              ></gf-value>
+            </div>
          </div>
          <div class="d-flex my-3">
            <div class="w-50" i18n>Activity Count</div>
            <div class="w-50">
-              <ng-container *ngIf="transactionCount">
-                {{ transactionCount }} ({{ transactionCount / userCount | number
-                : '1.2-2' }} <span i18n>per User</span>)
-              </ng-container>
-            </div>
-          </div>
-          <div class="d-flex my-3">
-            <div class="w-50" i18n>Data Management</div>
-            <div class="w-50">
-              <div class="overflow-hidden">
-                <div class="mb-2">
-                  <button
-                    color="accent"
-                    mat-flat-button
-                    (click)="onGather7Days()"
-                  >
-                    <ion-icon
-                      class="mr-1"
-                      name="cloud-download-outline"
-                    ></ion-icon>
-                    <span i18n>Gather Recent Data</span>
-                  </button>
-                </div>
-                <div class="mb-2">
-                  <button
-                    color="accent"
-                    mat-flat-button
-                    (click)="onGatherMax()"
-                  >
-                    <ion-icon
-                      class="mr-1"
-                      name="cloud-download-outline"
-                    ></ion-icon>
-                    <span i18n>Gather All Data</span>
-                  </button>
-                </div>
-                <div>
-                  <button
-                    class="mb-2 mr-2"
-                    color="accent"
-                    mat-flat-button
-                    (click)="onGatherProfileData()"
-                  >
-                    <ion-icon
-                      class="mr-1"
-                      name="cloud-download-outline"
-                    ></ion-icon>
-                    <span i18n>Gather Profile Data</span>
-                  </button>
-                </div>
+              <gf-value
+                precision="0"
+                [locale]="user?.settings?.locale"
+                [value]="transactionCount"
+              ></gf-value>
+              <div *ngIf="transactionCount && userCount">
+                {{ transactionCount / userCount | number : '1.2-2' }}
+                <span i18n>per User</span>
              </div>
            </div>
          </div>
@ -108,10 +72,20 @@
              </div>
            </div>
          </div>
+          <div class="align-items-start d-flex my-3">
+            <div class="w-50" i18n>Benchmarks</div>
+            <div class="w-50">
+              <table>
+                <tr *ngFor="let benchmark of info?.benchmarks">
+                  <td class="pl-1">{{ benchmark.symbol }}</td>
+                </tr>
+              </table>
+            </div>
+          </div>
          <div *ngIf="hasPermissionForSystemMessage" class="d-flex my-3">
            <div class="w-50" i18n>System Message</div>
            <div class="w-50">
-              <div *ngIf="info.systemMessage">
+              <div *ngIf="info?.systemMessage">
                <span>{{ info.systemMessage }}</span>
                <button
                  class="mini-icon mx-1 no-min-width px-2"
@ -122,7 +96,7 @@
                </button>
              </div>
              <button
-                *ngIf="!info.systemMessage"
+                *ngIf="!info?.systemMessage"
                color="accent"
                mat-flat-button
                (click)="onSetSystemMessage()"
@ -162,8 +136,11 @@
                </button>
              </div>
              <div class="mt-2">
-                <form #couponForm="ngForm">
-                  <mat-form-field appearance="outline" class="mr-2">
+                <form #couponForm="ngForm" class="align-items-center d-flex">
+                  <mat-form-field
+                    appearance="outline"
+                    class="compact-with-outline mr-2 without-hint"
+                  >
                    <mat-select
                      name="duration"
                      [value]="couponDuration"
@ -176,6 +153,7 @@
                    </mat-select>
                  </mat-form-field>
                  <button
+                    class="mt-1"
                    color="primary"
                    mat-flat-button
                    (click)="onAddCoupon()"
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@ -43,23 +43,23 @@
              <td class="mat-cell px-1 py-2 text-right">
                {{ formatDistanceToNow(userItem.createdAt) }}
              </td>
-              <td class="mat-cell px-1 py-2">
+              <td class="mat-cell px-1 py-2 text-right">
                <gf-value
-                  class="align-items-end"
+                  class="d-inline-block justify-content-end"
                  [locale]="user?.settings?.locale"
                  [value]="userItem.accountCount"
                ></gf-value>
              </td>
-              <td class="mat-cell px-1 py-2">
+              <td class="mat-cell px-1 py-2 text-right">
                <gf-value
-                  class="align-items-end"
+                  class="d-inline-block justify-content-end"
                  [locale]="user?.settings?.locale"
                  [value]="userItem.transactionCount"
                ></gf-value>
              </td>
-              <td class="mat-cell px-1 py-2">
+              <td class="mat-cell px-1 py-2 text-right">
                <gf-value
-                  class="align-items-end"
+                  class="d-inline-block justify-content-end"
                  [locale]="user?.settings?.locale"
                  [precision]="0"
                  [value]="userItem.engagement"
--- a/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html
+++ b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html
@ -1,8 +1,7 @@
-<div class="row">
+<div class="mb-2 row">
  <div class="col-md-6 col-xs-12 d-flex">
    <div class="align-items-center d-flex flex-grow-1 h5 mb-0 text-truncate">
-      <span i18n>Benchmarks</span>
-      <sup i18n>Beta</sup>
+      <span i18n>Performance</span>
      <gf-premium-indicator
        *ngIf="user?.subscription?.type === 'Basic'"
        class="ml-1"
@ -10,13 +9,20 @@
    </div>
  </div>
  <div class="col-md-6 col-xs-12 d-flex justify-content-end">
-    <mat-form-field appearance="outline" class="w-100" color="accent">
+    <mat-form-field
+      appearance="outline"
+      class="w-100 without-hint"
+      color="accent"
+      [hidden]="benchmarks?.length === 0"
+    >
      <mat-label i18n>Compare with...</mat-label>
      <mat-select
        name="benchmark"
+        [disabled]="user?.subscription?.type === 'Basic'"
        [value]="benchmark"
        (selectionChange)="onChangeBenchmark($event.value)"
      >
+        <mat-option [value]="null"></mat-option>
        <mat-option
          *ngFor="let symbolProfile of benchmarks"
          [value]="symbolProfile.id"
@ -26,14 +32,6 @@
    </mat-form-field>
  </div>
 </div>
-<div *ngIf="user.settings.viewMode !== 'ZEN'" class="mb-3 text-center">
-  <gf-toggle
-    [defaultValue]="user?.settings?.dateRange"
-    [isLoading]="isLoading"
-    [options]="dateRangeOptions"
-    (change)="onChangeDateRange($event.value)"
-  ></gf-toggle>
-</div>
 <div class="chart-container">
  <ngx-skeleton-loader
    *ngIf="isLoading"
--- a/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts
+++ b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts
@ -10,7 +10,6 @@ import {
  Output,
  ViewChild
 } from '@angular/core';
-import { ToggleComponent } from '@ghostfolio/client/components/toggle/toggle.component';
 import {
  getTooltipOptions,
  getTooltipPositionerMapTop,
@ -24,7 +23,8 @@ import {
  parseDate
 } from '@ghostfolio/common/helper';
 import { LineChartItem, User } from '@ghostfolio/common/interfaces';
-import { DateRange } from '@ghostfolio/common/types';
+import { ColorScheme } from '@ghostfolio/common/types';
+import { SymbolProfile } from '@prisma/client';
 import {
  Chart,
  LineController,
@ -35,7 +35,6 @@ import {
  Tooltip
 } from 'chart.js';
 import annotationPlugin from 'chartjs-plugin-annotation';
-import { SymbolProfile } from '@prisma/client';

@Component({
  selector: 'gf-benchmark-comparator',
@ -47,6 +46,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
  @Input() benchmarkDataItems: LineChartItem[] = [];
  @Input() benchmark: string;
  @Input() benchmarks: Partial<SymbolProfile>[];
+  @Input() colorScheme: ColorScheme;
  @Input() daysInMarket: number;
  @Input() isLoading: boolean;
  @Input() locale: string;
@ -54,12 +54,10 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
  @Input() user: User;

  @Output() benchmarkChanged = new EventEmitter<string>();
-  @Output() dateRangeChanged = new EventEmitter<DateRange>();

  @ViewChild('chartCanvas') chartCanvas;

  public chart: Chart<any>;
-  public dateRangeOptions = ToggleComponent.DEFAULT_DATE_RANGE_OPTIONS;

  public constructor() {
    Chart.register(
@ -86,10 +84,6 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
    this.benchmarkChanged.next(symbolProfileId);
  }

-  public onChangeDateRange(dateRange: DateRange) {
-    this.dateRangeChanged.next(dateRange);
-  }
-
  public ngOnDestroy() {
    this.chart?.destroy();
  }
@ -135,7 +129,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
                tension: 0
              },
              point: {
-                hoverBackgroundColor: getBackgroundColor(),
+                hoverBackgroundColor: getBackgroundColor(this.colorScheme),
                hoverRadius: 2,
                radius: 0
              }
@ -146,7 +140,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
              annotation: {
                annotations: {
                  yAxis: {
-                    borderColor: `rgba(${getTextColor()}, 0.1)`,
+                    borderColor: `rgba(${getTextColor(this.colorScheme)}, 0.1)`,
                    borderWidth: 1,
                    scaleID: 'y',
                    type: 'line',
@ -159,7 +153,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
              },
              tooltip: this.getTooltipPluginConfiguration(),
              verticalHoverLine: {
-                color: `rgba(${getTextColor()}, 0.1)`
+                color: `rgba(${getTextColor(this.colorScheme)}, 0.1)`
              }
            },
            responsive: true,
@ -167,9 +161,9 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
              x: {
                display: true,
                grid: {
-                  borderColor: `rgba(${getTextColor()}, 0.1)`,
+                  borderColor: `rgba(${getTextColor(this.colorScheme)}, 0.1)`,
                  borderWidth: 1,
-                  color: `rgba(${getTextColor()}, 0.8)`,
+                  color: `rgba(${getTextColor(this.colorScheme)}, 0.8)`,
                  display: false
                },
                type: 'time',
@ -181,8 +175,8 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
              y: {
                display: true,
                grid: {
-                  borderColor: `rgba(${getTextColor()}, 0.1)`,
-                  color: `rgba(${getTextColor()}, 0.8)`,
+                  borderColor: `rgba(${getTextColor(this.colorScheme)}, 0.1)`,
+                  color: `rgba(${getTextColor(this.colorScheme)}, 0.8)`,
                  display: false,
                  drawBorder: false
                },
@ -198,7 +192,9 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
              }
            }
          },
-          plugins: [getVerticalHoverLinePlugin(this.chartCanvas)],
+          plugins: [
+            getVerticalHoverLinePlugin(this.chartCanvas, this.colorScheme)
+          ],
          type: 'line'
        });
      }
@ -208,6 +204,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
  private getTooltipPluginConfiguration() {
    return {
      ...getTooltipOptions({
+        colorScheme: this.colorScheme,
        locale: this.locale,
        unit: '%'
      }),
--- a/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.module.ts
+++ b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.module.ts
@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatSelectModule } from '@angular/material/select';
-import { GfToggleModule } from '@ghostfolio/client/components/toggle/toggle.module';
+import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';

 import { BenchmarkComparatorComponent } from './benchmark-comparator.component';
@ -13,7 +13,7 @@ import { BenchmarkComparatorComponent } from './benchmark-comparator.component';
  imports: [
    CommonModule,
    FormsModule,
-    GfToggleModule,
+    GfPremiumIndicatorModule,
    MatSelectModule,
    NgxSkeletonLoaderModule,
    ReactiveFormsModule
--- a/apps/client/src/app/components/home-holdings/home-holdings.component.ts
+++ b/apps/client/src/app/components/home-holdings/home-holdings.component.ts
@ -127,6 +127,7 @@ export class HomeHoldingsComponent implements OnDestroy, OnInit {
            dataSource,
            symbol,
            baseCurrency: this.user?.settings?.baseCurrency,
+            colorScheme: this.user?.settings?.colorScheme,
            deviceType: this.deviceType,
            hasImpersonationId: this.hasImpersonationId,
            hasPermissionToReportDataGlitch: hasPermission(
--- a/apps/client/src/app/components/home-market/home-market.component.ts
+++ b/apps/client/src/app/components/home-market/home-market.component.ts
@ -24,7 +24,7 @@ export class HomeMarketComponent implements OnDestroy, OnInit {
  public fearLabel = $localize`Fear`;
  public greedLabel = $localize`Greed`;
  public hasPermissionToAccessFearAndGreedIndex: boolean;
-  public historicalData: HistoricalDataItem[];
+  public historicalDataItems: HistoricalDataItem[];
  public info: InfoItem;
  public isLoading = true;
  public readonly numberOfDays = 180;
@ -67,7 +67,7 @@ export class HomeMarketComponent implements OnDestroy, OnInit {
        .pipe(takeUntil(this.unsubscribeSubject))
        .subscribe(({ historicalData, marketPrice }) => {
          this.fearAndGreedIndex = marketPrice;
-          this.historicalData = [
+          this.historicalDataItems = [
            ...historicalData,
            {
              date: resetHours(new Date()).toISOString(),
--- a/apps/client/src/app/components/home-market/home-market.html
+++ b/apps/client/src/app/components/home-market/home-market.html
@ -10,7 +10,8 @@
        symbol="Fear & Greed Index"
        yMax="100"
        yMin="0"
-        [historicalDataItems]="historicalData"
+        [historicalDataItems]="historicalDataItems"
+        [isAnimated]="true"
        [locale]="user?.settings?.locale"
        [showXAxis]="true"
        [showYAxis]="true"
--- a/apps/client/src/app/components/home-overview/home-overview.component.ts
+++ b/apps/client/src/app/components/home-overview/home-overview.component.ts
@ -76,8 +76,6 @@ export class HomeOverviewComponent implements OnDestroy, OnInit {
      !this.hasImpersonationId &&
      !this.user.settings.isRestrictedView &&
      this.user.settings.viewMode !== 'ZEN';
-
-    this.update();
  }

  public onChangeDateRange(dateRange: DateRange) {
@ -104,36 +102,29 @@ export class HomeOverviewComponent implements OnDestroy, OnInit {
  }

  private update() {
+    this.historicalDataItems = null;
    this.isLoadingPerformance = true;

    this.dataService
-      .fetchChart({
-        range: this.user?.settings?.dateRange,
-        version: this.user?.settings?.isExperimentalFeatures ? 2 : 1
+      .fetchPortfolioPerformance({
+        range: this.user?.settings?.dateRange
      })
      .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe((chartData) => {
-        this.historicalDataItems = chartData.chart.map((chartDataItem) => {
-          return {
-            date: chartDataItem.date,
-            value: chartDataItem.value
-          };
-        });
-        this.isAllTimeHigh = chartData.isAllTimeHigh;
-        this.isAllTimeLow = chartData.isAllTimeLow;
-
-        this.changeDetectorRef.markForCheck();
-      });
-
-    this.dataService
-      .fetchPortfolioPerformance({ range: this.user?.settings?.dateRange })
-      .pipe(takeUntil(this.unsubscribeSubject))
      .subscribe((response) => {
        this.errors = response.errors;
        this.hasError = response.hasErrors;
        this.performance = response.performance;
        this.isLoadingPerformance = false;

+        this.historicalDataItems = response.chart.map(
+          ({ date, netPerformanceInPercentage }) => {
+            return {
+              date,
+              value: netPerformanceInPercentage
+            };
+          }
+        );
+
        this.changeDetectorRef.markForCheck();
      });

--- a/apps/client/src/app/components/home-overview/home-overview.html
+++ b/apps/client/src/app/components/home-overview/home-overview.html
@ -15,16 +15,17 @@
        <gf-line-chart
          class="position-absolute"
          symbol="Performance"
-          [currency]="user?.settings?.isExperimentalFeatures ? undefined : user?.settings?.baseCurrency"
-          [historicalDataItems]="historicalDataItems"
+          unit="%"
+          [colorScheme]="user?.settings?.colorScheme"
          [hidden]="historicalDataItems?.length === 0"
+          [historicalDataItems]="historicalDataItems"
+          [isAnimated]="user?.settings?.dateRange === '1d' ? false : true"
          [locale]="user?.settings?.locale"
          [ngClass]="{ 'pr-3': deviceType === 'mobile' }"
          [showGradient]="true"
          [showLoader]="false"
          [showXAxis]="false"
          [showYAxis]="false"
-          [unit]="user?.settings?.isExperimentalFeatures ? '%' : undefined"
        ></gf-line-chart>
      </div>
    </div>
--- a/apps/client/src/app/components/home-summary/home-summary.component.ts
+++ b/apps/client/src/app/components/home-summary/home-summary.component.ts
@ -1,8 +1,18 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  MatSnackBar,
+  MatSnackBarRef,
+  TextOnlySnackBar
+} from '@angular/material/snack-bar';
+import { Router } from '@angular/router';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
-import { PortfolioSummary, User } from '@ghostfolio/common/interfaces';
+import {
+  InfoItem,
+  PortfolioSummary,
+  User
+} from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
@ -14,8 +24,11 @@ import { takeUntil } from 'rxjs/operators';
 })
 export class HomeSummaryComponent implements OnDestroy, OnInit {
  public hasImpersonationId: boolean;
+  public hasPermissionForSubscription: boolean;
  public hasPermissionToUpdateUserSettings: boolean;
+  public info: InfoItem;
  public isLoading = true;
+  public snackBarRef: MatSnackBarRef<TextOnlySnackBar>;
  public summary: PortfolioSummary;
  public user: User;

@ -25,8 +38,17 @@ export class HomeSummaryComponent implements OnDestroy, OnInit {
    private changeDetectorRef: ChangeDetectorRef,
    private dataService: DataService,
    private impersonationStorageService: ImpersonationStorageService,
+    private router: Router,
+    private snackBar: MatSnackBar,
    private userService: UserService
  ) {
+    this.info = this.dataService.fetchInfo();
+
+    this.hasPermissionForSubscription = hasPermission(
+      this.info?.globalPermissions,
+      permissions.enableSubscription
+    );
+
    this.userService.stateChanged
      .pipe(takeUntil(this.unsubscribeSubject))
      .subscribe((state) => {
@ -50,8 +72,6 @@ export class HomeSummaryComponent implements OnDestroy, OnInit {
      .subscribe((aId) => {
        this.hasImpersonationId = !!aId;
      });
-
-    this.update();
  }

  public onChangeEmergencyFund(emergencyFund: number) {
@ -81,12 +101,30 @@ export class HomeSummaryComponent implements OnDestroy, OnInit {
    this.isLoading = true;

    this.dataService
-      .fetchPortfolioSummary()
+      .fetchPortfolioDetails({})
      .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe((response) => {
-        this.summary = response;
+      .subscribe(({ summary }) => {
+        this.summary = summary;
        this.isLoading = false;

+        if (!this.summary) {
+          this.snackBarRef = this.snackBar.open(
+            $localize`This feature requires a subscription.`,
+            this.hasPermissionForSubscription
+              ? $localize`Upgrade Plan`
+              : undefined,
+            { duration: 6000 }
+          );
+
+          this.snackBarRef.afterDismissed().subscribe(() => {
+            this.snackBarRef = undefined;
+          });
+
+          this.snackBarRef.onAction().subscribe(() => {
+            this.router.navigate(['/pricing']);
+          });
+        }
+
        this.changeDetectorRef.markForCheck();
      });

--- a/apps/client/src/app/components/investment-chart/investment-chart.component.ts
+++ b/apps/client/src/app/components/investment-chart/investment-chart.component.ts
@ -15,14 +15,16 @@ import {
 } from '@ghostfolio/common/chart-helper';
 import { primaryColorRgb, secondaryColorRgb } from '@ghostfolio/common/config';
 import {
+  DATE_FORMAT,
  getBackgroundColor,
  getDateFormatString,
  getTextColor,
  parseDate,
  transformTickToAbbreviation
 } from '@ghostfolio/common/helper';
+import { LineChartItem } from '@ghostfolio/common/interfaces';
 import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
-import { GroupBy } from '@ghostfolio/common/types';
+import { ColorScheme, DateRange, GroupBy } from '@ghostfolio/common/types';
 import {
  BarController,
  BarElement,
@ -35,7 +37,8 @@ import {
  Tooltip
 } from 'chart.js';
 import annotationPlugin from 'chartjs-plugin-annotation';
-import { addDays, isAfter, parseISO, subDays } from 'date-fns';
+import { addDays, format, isAfter, parseISO, subDays } from 'date-fns';
+import { last } from 'lodash';

@Component({
  selector: 'gf-investment-chart',
@ -44,20 +47,23 @@ import { addDays, isAfter, parseISO, subDays } from 'date-fns';
  styleUrls: ['./investment-chart.component.scss']
 })
 export class InvestmentChartComponent implements OnChanges, OnDestroy {
+  @Input() benchmarkDataItems: InvestmentItem[] = [];
+  @Input() colorScheme: ColorScheme;
  @Input() currency: string;
  @Input() daysInMarket: number;
  @Input() groupBy: GroupBy;
-  @Input() investments: InvestmentItem[];
+  @Input() historicalDataItems: LineChartItem[] = [];
  @Input() isInPercent = false;
+  @Input() isLoading = false;
  @Input() locale: string;
+  @Input() range: DateRange = 'max';
  @Input() savingsRate = 0;

  @ViewChild('chartCanvas') chartCanvas;

-  public chart: Chart;
-  public isLoading = true;
-
-  private data: InvestmentItem[];
+  public chart: Chart<any>;
+  private investments: InvestmentItem[];
+  private values: LineChartItem[];

  public constructor() {
    Chart.register(
@ -77,7 +83,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
  }

  public ngOnChanges() {
-    if (this.investments) {
+    if (this.benchmarkDataItems && this.historicalDataItems) {
      this.initialize();
    }
  }
@ -87,49 +93,89 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
  }

  private initialize() {
-    this.isLoading = true;
-
    // Create a clone
-    this.data = this.investments.map((a) => Object.assign({}, a));
+    this.investments = this.benchmarkDataItems.map((item) =>
+      Object.assign({}, item)
+    );
+    this.values = this.historicalDataItems.map((item) =>
+      Object.assign({}, item)
+    );

-    if (!this.groupBy && this.data?.length > 0) {
-      // Extend chart by 5% of days in market (before)
-      const firstItem = this.data[0];
-      this.data.unshift({
-        ...firstItem,
-        date: subDays(
-          parseISO(firstItem.date),
-          this.daysInMarket * 0.05 || 90
-        ).toISOString(),
-        investment: 0
-      });
+    if (!this.groupBy && this.investments?.length > 0) {
+      let date: string;
+
+      if (this.range === 'max') {
+        // Extend chart by 5% of days in market (before)
+        date = format(
+          subDays(
+            parseISO(this.investments[0].date),
+            this.daysInMarket * 0.05 || 90
+          ),
+          DATE_FORMAT
+        );
+        this.investments.unshift({
+          date,
+          investment: 0
+        });
+        this.values.unshift({
+          date,
+          value: 0
+        });
+      }

      // Extend chart by 5% of days in market (after)
-      const lastItem = this.data[this.data.length - 1];
-      this.data.push({
-        ...lastItem,
-        date: addDays(
-          parseDate(lastItem.date),
+      date = format(
+        addDays(
+          parseDate(last(this.investments).date),
          this.daysInMarket * 0.05 || 90
-        ).toISOString()
+        ),
+        DATE_FORMAT
+      );
+      this.investments.push({
+        date,
+        investment: last(this.investments).investment
      });
+      this.values.push({ date, value: last(this.values).value });
    }

    const data = {
-      labels: this.data.map((investmentItem) => {
-        return investmentItem.date;
+      labels: this.historicalDataItems.map(({ date }) => {
+        return parseDate(date);
      }),
      datasets: [
        {
-          backgroundColor: `rgb(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b})`,
-          borderColor: `rgb(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b})`,
-          borderWidth: this.groupBy ? 0 : 2,
-          data: this.data.map((position) => {
-            return this.isInPercent
-              ? position.investment * 100
-              : position.investment;
+          backgroundColor: `rgb(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b})`,
+          borderColor: `rgb(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b})`,
+          borderWidth: this.groupBy ? 0 : 1,
+          data: this.investments.map(({ date, investment }) => {
+            return {
+              x: parseDate(date),
+              y: this.isInPercent ? investment * 100 : investment
+            };
          }),
          label: $localize`Deposit`,
+          segment: {
+            borderColor: (context: unknown) =>
+              this.isInFuture(
+                context,
+                `rgba(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b}, 0.67)`
+              ),
+            borderDash: (context: unknown) => this.isInFuture(context, [2, 2])
+          },
+          stepped: true
+        },
+        {
+          borderColor: `rgb(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b})`,
+          borderWidth: 2,
+          data: this.values.map(({ date, value }) => {
+            return {
+              x: parseDate(date),
+              y: this.isInPercent ? value * 100 : value
+            };
+          }),
+          fill: false,
+          label: $localize`Total Amount`,
+          pointRadius: 0,
          segment: {
            borderColor: (context: unknown) =>
              this.isInFuture(
@ -137,8 +183,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
                `rgba(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b}, 0.67)`
              ),
            borderDash: (context: unknown) => this.isInFuture(context, [2, 2])
-          },
-          stepped: true
+          }
        }
      ]
    };
@ -160,7 +205,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
                tension: 0
              },
              point: {
-                hoverBackgroundColor: getBackgroundColor(),
+                hoverBackgroundColor: getBackgroundColor(this.colorScheme),
                hoverRadius: 2,
                radius: 0
              }
@ -172,13 +217,13 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
                annotations: {
                  savingsRate: this.savingsRate
                    ? {
-                        borderColor: `rgba(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b}, 0.75)`,
+                        borderColor: `rgba(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b}, 0.75)`,
                        borderWidth: 1,
                        label: {
-                          backgroundColor: `rgb(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b})`,
+                          backgroundColor: `rgb(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b})`,
                          borderRadius: 2,
                          color: 'white',
-                          content: 'Savings Rate',
+                          content: $localize`Savings Rate`,
                          display: true,
                          font: { size: '10px', weight: 'normal' },
                          padding: {
@ -193,7 +238,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
                      }
                    : undefined,
                  yAxis: {
-                    borderColor: `rgba(${getTextColor()}, 0.1)`,
+                    borderColor: `rgba(${getTextColor(this.colorScheme)}, 0.1)`,
                    borderWidth: 1,
                    scaleID: 'y',
                    type: 'line',
@ -206,7 +251,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
              },
              tooltip: this.getTooltipPluginConfiguration(),
              verticalHoverLine: {
-                color: `rgba(${getTextColor()}, 0.1)`
+                color: `rgba(${getTextColor(this.colorScheme)}, 0.1)`
              }
            },
            responsive: true,
@ -214,9 +259,9 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
              x: {
                display: true,
                grid: {
-                  borderColor: `rgba(${getTextColor()}, 0.1)`,
+                  borderColor: `rgba(${getTextColor(this.colorScheme)}, 0.1)`,
                  borderWidth: this.groupBy ? 0 : 1,
-                  color: `rgba(${getTextColor()}, 0.8)`,
+                  color: `rgba(${getTextColor(this.colorScheme)}, 0.8)`,
                  display: false
                },
                type: 'time',
@ -228,8 +273,8 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
              y: {
                display: !this.isInPercent,
                grid: {
-                  borderColor: `rgba(${getTextColor()}, 0.1)`,
-                  color: `rgba(${getTextColor()}, 0.8)`,
+                  borderColor: `rgba(${getTextColor(this.colorScheme)}, 0.1)`,
+                  color: `rgba(${getTextColor(this.colorScheme)}, 0.8)`,
                  display: false,
                  drawBorder: false
                },
@ -245,18 +290,19 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
              }
            }
          },
-          plugins: [getVerticalHoverLinePlugin(this.chartCanvas)],
+          plugins: [
+            getVerticalHoverLinePlugin(this.chartCanvas, this.colorScheme)
+          ],
          type: this.groupBy ? 'bar' : 'line'
        });
      }
    }
-
-    this.isLoading = false;
  }

  private getTooltipPluginConfiguration() {
    return {
      ...getTooltipOptions({
+        colorScheme: this.colorScheme,
        currency: this.isInPercent ? undefined : this.currency,
        locale: this.isInPercent ? undefined : this.locale,
        unit: this.isInPercent ? '%' : undefined
--- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
+++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
@ -22,9 +22,6 @@
  <div class="row px-3 py-1">
    <div class="d-flex flex-grow-1" i18n>Sell</div>
    <div class="d-flex justify-content-end">
-      <span *ngIf="summary?.totalSell || summary?.totalSell === 0" class="mr-1"
-        >-</span
-      >
      <gf-value
        class="justify-content-end"
        [currency]="baseCurrency"
@ -172,6 +169,17 @@
      ></gf-value>
    </div>
  </div>
+  <div class="row px-3 py-1">
+    <div class="d-flex flex-grow-1" i18n>Excluded from Analysis</div>
+    <div class="d-flex justify-content-end">
+      <gf-value
+        class="justify-content-end"
+        [currency]="baseCurrency"
+        [locale]="locale"
+        [value]="isLoading ? undefined : summary?.excludedAccountsAndActivities"
+      ></gf-value>
+    </div>
+  </div>
  <div class="row">
    <div class="col"><hr /></div>
  </div>
--- a/apps/client/src/app/components/position/position-detail-dialog/interfaces/interfaces.ts
+++ b/apps/client/src/app/components/position/position-detail-dialog/interfaces/interfaces.ts
@ -1,7 +1,9 @@
+import { ColorScheme } from '@ghostfolio/common/types';
 import { DataSource } from '@prisma/client';

 export interface PositionDetailDialogParams {
  baseCurrency: string;
+  colorScheme: ColorScheme;
  dataSource: DataSource;
  deviceType: string;
  hasImpersonationId: boolean;
--- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts
+++ b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts
@ -14,6 +14,7 @@ import {
  LineChartItem
 } from '@ghostfolio/common/interfaces';
 import { OrderWithAccount } from '@ghostfolio/common/types';
+import { translate } from '@ghostfolio/ui/i18n';
 import { Tag } from '@prisma/client';
 import { format, isSameMonth, isToday, parseISO } from 'date-fns';
 import { Subject } from 'rxjs';
@ -29,6 +30,8 @@ import { PositionDetailDialogParams } from './interfaces/interfaces';
  styleUrls: ['./position-detail-dialog.component.scss']
 })
 export class PositionDetailDialog implements OnDestroy, OnInit {
+  public assetClass: string;
+  public assetSubClass: string;
  public averagePrice: number;
  public benchmarkDataItems: LineChartItem[];
  public countries: {
@ -126,6 +129,14 @@ export class PositionDetailDialog implements OnDestroy, OnInit {
          this.transactionCount = transactionCount;
          this.value = value;

+          if (SymbolProfile?.assetClass) {
+            this.assetClass = translate(SymbolProfile?.assetClass);
+          }
+
+          if (SymbolProfile?.assetSubClass) {
+            this.assetSubClass = translate(SymbolProfile?.assetSubClass);
+          }
+
          if (SymbolProfile?.countries?.length > 0) {
            for (const country of SymbolProfile.countries) {
              this.countries[country.code] = {
--- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html
+++ b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html
@ -20,11 +20,13 @@
    </div>

    <gf-line-chart
-      class="mb-4"
      benchmarkLabel="Average Unit Price"
+      class="mb-4"
      [benchmarkDataItems]="benchmarkDataItems"
+      [colorScheme]="data.colorScheme"
      [currency]="SymbolProfile?.currency"
      [historicalDataItems]="historicalDataItems"
+      [isAnimated]="true"
      [locale]="data.locale"
      [showGradient]="true"
      [showXAxis]="true"
@ -137,11 +139,7 @@
        >
      </div>
      <div class="col-6 mb-3">
-        <gf-value
-          i18n
-          size="medium"
-          [hidden]="!SymbolProfile?.assetClass"
-          [value]="SymbolProfile?.assetClass"
+        <gf-value i18n size="medium" [hidden]="!assetClass" [value]="assetClass"
          >Asset Class</gf-value
        >
      </div>
@ -149,8 +147,8 @@
        <gf-value
          i18n
          size="medium"
-          [hidden]="!SymbolProfile?.assetSubClass"
-          [value]="SymbolProfile?.assetSubClass"
+          [hidden]="!assetSubClass"
+          [value]="assetSubClass"
          >Asset Sub Class</gf-value
        >
      </div>
@ -187,6 +185,7 @@
            <div class="h5" i18n>Sectors</div>
            <gf-portfolio-proportion-chart
              [baseCurrency]="user?.settings?.baseCurrency"
+              [colorScheme]="data.colorScheme"
              [isInPercent]="true"
              [keys]="['name']"
              [locale]="user?.settings?.locale"
@ -198,6 +197,7 @@
            <div class="h5" i18n>Countries</div>
            <gf-portfolio-proportion-chart
              [baseCurrency]="user?.settings?.baseCurrency"
+              [colorScheme]="data.colorScheme"
              [isInPercent]="true"
              [keys]="['name']"
              [locale]="user?.settings?.locale"
@ -209,7 +209,7 @@
      </ng-container>
    </div>

-    <div *ngIf="orders?.length > 0" class="row">
+    <div class="row" [ngClass]="{ 'd-none': !orders?.length }">
      <div class="col mb-3">
        <div class="h5 mb-0" i18n>Activities</div>
        <gf-activities-table
@ -217,7 +217,7 @@
          [baseCurrency]="data.baseCurrency"
          [deviceType]="data.deviceType"
          [hasPermissionToCreateActivity]="false"
-          [hasPermissionToExportActivities]="!hasImpersonationId"
+          [hasPermissionToExportActivities]="true"
          [hasPermissionToFilter]="false"
          [hasPermissionToImportActivities]="false"
          [hasPermissionToOpenDetails]="false"
--- a/apps/client/src/app/components/rules/rules.component.html
+++ b/apps/client/src/app/components/rules/rules.component.html
@ -10,7 +10,7 @@
        ></gf-no-transactions-info-indicator>
      </mat-card>

-      <gf-rule *ngIf="rules === undefined" [isLoading]="true"></gf-rule>
+      <gf-rule *ngIf="rules?.length === 0" [isLoading]="true"></gf-rule>
      <ng-container *ngIf="rules !== null && rules !== undefined">
        <gf-rule *ngFor="let rule of rules" [rule]="rule"></gf-rule>
      </ng-container>
--- a/apps/client/src/app/components/rules/rules.component.ts
+++ b/apps/client/src/app/components/rules/rules.component.ts
@ -9,7 +9,7 @@ import { PortfolioReportRule } from '@ghostfolio/common/interfaces';
 })
 export class RulesComponent {
  @Input() hasPermissionToCreateOrder: boolean;
-  @Input() rules: PortfolioReportRule;
+  @Input() rules: PortfolioReportRule[];

  public constructor() {}
 }
--- a/apps/client/src/app/components/rules/rules.module.ts
+++ b/apps/client/src/app/components/rules/rules.module.ts
@ -21,4 +21,4 @@ import { RulesComponent } from './rules.component';
  ],
  schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
-export class RulesModule {}
+export class GfRulesModule {}
--- a/apps/client/src/app/core/auth.guard.ts
+++ b/apps/client/src/app/core/auth.guard.ts
@ -5,6 +5,7 @@ import {
  Router,
  RouterStateSnapshot
 } from '@angular/router';
+import { DataService } from '@ghostfolio/client/services/data.service';
 import { SettingsStorageService } from '@ghostfolio/client/services/settings-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { EMPTY } from 'rxjs';
@ -30,6 +31,7 @@ export class AuthGuard implements CanActivate {
  ];

  constructor(
+    private dataService: DataService,
    private router: Router,
    private settingsStorageService: SettingsStorageService,
    private userService: UserService
@ -74,8 +76,17 @@ export class AuthGuard implements CanActivate {
          const userLanguage = user?.settings?.language;

          if (userLanguage && document.documentElement.lang !== userLanguage) {
-            window.location.href = `../${userLanguage}`;
-            resolve(false);
+            this.dataService
+              .putUserSetting({ language: document.documentElement.lang })
+              .subscribe(() => {
+                this.userService.remove();
+
+                setTimeout(() => {
+                  window.location.reload();
+                }, 300);
+              });
+
+            resolve(true);
            return;
          } else if (
            state.url.startsWith('/home') &&
--- a/apps/client/src/app/pages/about/about-page.html
+++ b/apps/client/src/app/pages/about/about-page.html
@ -96,6 +96,20 @@
            title="Ghostfolio is an independent & bootstrapped business"
          ></div>
        </div>
+        <div
+          *ngIf="!hasPermissionForSubscription"
+          class="d-flex justify-content-center"
+        >
+          <a
+            href="https://www.buymeacoffee.com/ghostfolio"
+            target="_blank"
+            title="Support Ghostfolio"
+            ><img
+              class="mb-2"
+              src="../assets/images/button-buy-me-a-coffee.png"
+              width="180"
+          /></a>
+        </div>
      </div>
    </div>
  </div>
@ -177,7 +191,7 @@
      <a
        class="py-2 w-100"
        color="primary"
-        mat-stroked-button
+        mat-flat-button
        [routerLink]="['/faq']"
        >FAQ</a
      >
@ -189,7 +203,7 @@
      <a
        class="py-2 w-100"
        color="primary"
-        mat-stroked-button
+        mat-flat-button
        [routerLink]="['/about', 'changelog']"
        >Changelog & License</a
      >
@ -198,7 +212,7 @@
      <a
        class="py-2 w-100"
        color="primary"
-        mat-stroked-button
+        mat-flat-button
        [routerLink]="['/about', 'privacy-policy']"
        >Privacy Policy</a
      >
--- a/apps/client/src/app/pages/account/account-page.component.ts
+++ b/apps/client/src/app/pages/account/account-page.component.ts
@ -42,6 +42,7 @@ export class AccountPageComponent implements OnDestroy, OnInit {
  signInWithFingerprintElement: MatSlideToggle;

  public accesses: Access[];
+  public appearancePlaceholder = $localize`Auto`;
  public baseCurrency: string;
  public coupon: number;
  public couponId: string;
@ -54,7 +55,7 @@ export class AccountPageComponent implements OnDestroy, OnInit {
  public hasPermissionToUpdateViewMode: boolean;
  public hasPermissionToUpdateUserSettings: boolean;
  public language = document.documentElement.lang;
-  public locales = ['de', 'de-CH', 'en-GB', 'en-US'];
+  public locales = ['de', 'de-CH', 'en-GB', 'en-US', 'es', 'it', 'nl'];
  public price: number;
  public priceId: string;
  public snackBarRef: MatSnackBarRef<TextOnlySnackBar>;
@ -302,6 +303,24 @@ export class AccountPageComponent implements OnDestroy, OnInit {
    }
  }

+  public onViewModeChange(aEvent: MatSlideToggleChange) {
+    this.dataService
+      .putUserSetting({ viewMode: aEvent.checked === true ? 'ZEN' : 'DEFAULT' })
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(() => {
+        this.userService.remove();
+
+        this.userService
+          .get()
+          .pipe(takeUntil(this.unsubscribeSubject))
+          .subscribe((user) => {
+            this.user = user;
+
+            this.changeDetectorRef.markForCheck();
+          });
+      });
+  }
+
  public ngOnDestroy() {
    this.unsubscribeSubject.next();
    this.unsubscribeSubject.complete();
--- a/apps/client/src/app/pages/account/account-page.html
+++ b/apps/client/src/app/pages/account/account-page.html
@ -94,7 +94,10 @@
                  <ng-container i18n>Base Currency</ng-container>
                </div>
                <div class="pl-1 w-50">
-                  <mat-form-field appearance="outline" class="w-100">
+                  <mat-form-field
+                    appearance="outline"
+                    class="compact-with-outline w-100 without-hint"
+                  >
                    <mat-select
                      name="baseCurrency"
                      [disabled]="!hasPermissionToUpdateUserSettings"
@ -116,7 +119,10 @@
                  <div class="hint-text text-muted" i18n>Beta</div>
                </div>
                <div class="pl-1 w-50">
-                  <mat-form-field appearance="outline" class="w-100">
+                  <mat-form-field
+                    appearance="outline"
+                    class="compact-with-outline w-100 without-hint"
+                  >
                    <mat-select
                      name="language"
                      [disabled]="!hasPermissionToUpdateUserSettings"
@ -126,6 +132,9 @@
                      <mat-option [value]="null"></mat-option>
                      <mat-option value="de">Deutsch</mat-option>
                      <mat-option value="en">English</mat-option>
+                      <mat-option value="es">Español</mat-option>
+                      <mat-option value="it">Italiano</mat-option>
+                      <mat-option value="nl">Nederlands</mat-option>
                    </mat-select>
                  </mat-form-field>
                </div>
@ -138,7 +147,10 @@
                  </div>
                </div>
                <div class="pl-1 w-50">
-                  <mat-form-field appearance="outline" class="w-100">
+                  <mat-form-field
+                    appearance="outline"
+                    class="compact-with-outline w-100 without-hint"
+                  >
                    <mat-select
                      name="locale"
                      [disabled]="!hasPermissionToUpdateUserSettings"
@ -157,26 +169,43 @@
              </div>
              <div class="d-flex">
                <div class="align-items-center d-flex pr-1 pt-1 w-50">
-                  <ng-container i18n>View Mode</ng-container>
+                  <ng-container i18n>Appearance</ng-container>
                </div>
                <div class="pl-1 w-50">
-                  <div class="align-items-center d-flex overflow-hidden">
-                    <mat-form-field appearance="outline" class="w-100">
-                      <mat-select
-                        name="viewMode"
-                        [disabled]="!hasPermissionToUpdateViewMode"
-                        [value]="user.settings.viewMode"
-                        (selectionChange)="onChangeUserSetting('viewMode', $event.value)"
-                      >
-                        <mat-option value="DEFAULT">Default</mat-option>
-                        <mat-option value="ZEN">Zen</mat-option>
-                      </mat-select>
-                    </mat-form-field>
-                  </div>
+                  <mat-form-field
+                    appearance="outline"
+                    class="compact-with-outline w-100 without-hint"
+                  >
+                    <mat-select
+                      class="with-placeholder-as-option"
+                      name="colorScheme"
+                      [disabled]="!hasPermissionToUpdateUserSettings"
+                      [placeholder]="appearancePlaceholder"
+                      [value]="user?.settings?.colorScheme"
+                      (selectionChange)="onChangeUserSetting('colorScheme', $event.value)"
+                    >
+                      <mat-option i18n [value]="null">Auto</mat-option>
+                      <mat-option i18n value="LIGHT">Light</mat-option>
+                      <mat-option i18n value="DARK">Dark</mat-option>
+                    </mat-select>
+                  </mat-form-field>
                </div>
              </div>
            </form>
          </div>
+          <div class="d-flex mt-4 py-1">
+            <div class="align-items-center d-flex pr-1 pt-1 w-50">
+              <ng-container i18n>Zen Mode</ng-container>
+            </div>
+            <div class="pl-1 w-50">
+              <mat-slide-toggle
+                color="primary"
+                [checked]="user.settings.viewMode === 'ZEN'"
+                [disabled]="!hasPermissionToUpdateViewMode"
+                (change)="onViewModeChange($event)"
+              ></mat-slide-toggle>
+            </div>
+          </div>
          <div class="align-items-center d-flex mt-4 py-1">
            <div class="pr-1 w-50" i18n>Sign in with fingerprint</div>
            <div class="pl-1 w-50">
@ -228,8 +257,8 @@
      class="align-items-center d-flex justify-content-center"
      color="primary"
      mat-fab
-      [routerLink]="[]"
      [queryParams]="{ createDialog: true }"
+      [routerLink]="[]"
    >
      <ion-icon name="add-outline" size="large"></ion-icon>
    </a>
--- a/apps/client/src/app/pages/accounts/accounts-page.component.ts
+++ b/apps/client/src/app/pages/accounts/accounts-page.component.ts
@ -59,8 +59,8 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
          this.openCreateAccountDialog();
        } else if (params['editDialog']) {
          if (this.accounts) {
-            const account = this.accounts.find((account) => {
-              return account.id === params['accountId'];
+            const account = this.accounts.find(({ id }) => {
+              return id === params['accountId'];
            });

            this.openUpdateAccountDialog(account);
@ -155,6 +155,7 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
    balance,
    currency,
    id,
+    isExcluded,
    name,
    platformId
  }: AccountModel): void {
@ -165,6 +166,7 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
          balance,
          currency,
          id,
+          isExcluded,
          name,
          platformId
        }
@ -231,6 +233,7 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
          accountType: AccountType.SECURITIES,
          balance: 0,
          currency: this.user?.settings?.baseCurrency,
+          isExcluded: false,
          name: null,
          platformId: null
        }
--- a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
+++ b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
@ -50,6 +50,14 @@
        </mat-select>
      </mat-form-field>
    </div>
+    <div class="mb-3 px-2">
+      <mat-checkbox
+        color="primary"
+        name="isExcluded"
+        [(ngModel)]="data.account.isExcluded"
+        >Exclude from Analysis</mat-checkbox
+      >
+    </div>
    <div *ngIf="data.account.id">
      <mat-form-field appearance="outline" class="w-100">
        <mat-label i18n>Account ID</mat-label>
--- a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.module.ts
+++ b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.module.ts
@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
+import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
@ -15,6 +16,7 @@ import { CreateOrUpdateAccountDialog } from './create-or-update-account-dialog.c
    CommonModule,
    FormsModule,
    MatButtonModule,
+    MatCheckboxModule,
    MatDialogModule,
    MatFormFieldModule,
    MatInputModule,
--- a/apps/client/src/app/pages/blog/2021/07/hallo-ghostfolio/hallo-ghostfolio-page.html
+++ b/apps/client/src/app/pages/blog/2021/07/hallo-ghostfolio/hallo-ghostfolio-page.html
@ -119,7 +119,7 @@
            Anlagestrategie? Ich freue mich über alle, die Ghostfolio
            ausprobieren. Bist du überzeugt vom Potential der Software? Jede
            Unterstützung für Ghostfolio ist willkommen. Sei es mit einer
-            <a href="https://ghostfol.io/pricing">Ghostfolio Premium</a>
+            <a [routerLink]="['/pricing']">Ghostfolio Premium</a>
            Subscription zur Finanzierung des Hostings, einem positiven Rating
            im
            <a
--- a/apps/client/src/app/pages/blog/2021/07/hello-ghostfolio/hello-ghostfolio-page.html
+++ b/apps/client/src/app/pages/blog/2021/07/hello-ghostfolio/hello-ghostfolio-page.html
@ -115,7 +115,7 @@
            strategy? I'm happy for everyone who tries Ghostfolio. Are you
            convinced of its potential? Any support for Ghostfolio is welcome.
            Be it with a
-            <a href="https://ghostfol.io/pricing">Ghostfolio Premium</a>
+            <a [routerLink]="['/pricing']">Ghostfolio Premium</a>
            Subscription to finance the hosting, a positive rating in the
            <a
              href="https://play.google.com/store/apps/details?id=ch.dotsilver.ghostfolio.twa"
--- a/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html
+++ b/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html
@ -74,7 +74,7 @@
            <a [routerLink]="['/markets']">economic situation</a> at this time,
            the goal set at the beginning of the year to build a sustainable
            business and reach break-even with the SaaS offering (<a
-              [routerLink]="['/markets']"
+              [routerLink]="['/pricing']"
              >Ghostfolio Premium</a
            >) has been achieved. We will continue to leverage the revenue to
            further improve the fully managed cloud offering for our paying
--- a/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page-routing.module.ts
+++ b/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page-routing.module.ts
@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
+
+import { Hacktoberfest2022PageComponent } from './hacktoberfest-2022-page.component';
+
+const routes: Routes = [
+  {
+    canActivate: [AuthGuard],
+    component: Hacktoberfest2022PageComponent,
+    path: '',
+    title: 'Hacktoberfest 2022'
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class Hacktoberfest2022RoutingModule {}
--- a/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.component.ts
+++ b/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.component.ts
@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+  host: { class: 'page' },
+  selector: 'gf-hacktoberfest-2022-page',
+  styleUrls: ['./hacktoberfest-2022-page.scss'],
+  templateUrl: './hacktoberfest-2022-page.html'
+})
+export class Hacktoberfest2022PageComponent {}
--- a/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.html
+++ b/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.html
@ -0,0 +1,178 @@
+<div class="blog container">
+  <div class="row">
+    <div class="col-md-8 offset-md-2">
+      <article>
+        <div class="mb-4 text-center">
+          <h1 class="mb-1">Hacktoberfest 2022</h1>
+          <div class="mb-3 text-muted"><small>2022-10-01</small></div>
+          <img
+            alt="Hacktoberfest 2022 with Ghostfolio Teaser"
+            class="rounded w-100"
+            src="../assets/images/blog/hacktoberfest-2022.png"
+            title="Hacktoberfest 2022 with Ghostfolio"
+          />
+        </div>
+        <section class="mb-4">
+          <p>
+            We are very excited to join
+            <a href="https://hacktoberfest.com">Hacktoberfest</a> for the first
+            time with <a href="https://ghostfol.io">Ghostfolio</a> and meet new
+            and ambitious open-source contributors. Hacktoberfest is a
+            month-long celebration of open-source projects, their maintainers,
+            and the entire community of contributors. Each October, open source
+            maintainers from all over the world give extra attention to new
+            contributors while guiding them through their first pull requests on
+            <a href="https://github.com/ghostfolio/ghostfolio">GitHub</a>.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">About Ghostfolio</h2>
+          <p>
+            Ghostfolio is a modern web application to manage your personal
+            finance. The software presents the current assets in real time and
+            supports the decision making of future investments. Whether
+            rebalancing the asset classes (stocks, ETFs, cryptocurrencies, etc.)
+            of your portfolio or financing an apartment, Ghostfolio offers
+            solid, data-driven decision support.
+          </p>
+          <p>
+            Ghostfolio is written in
+            <a href="https://www.typescriptlang.org">TypeScript</a> and
+            organized as an <a href="https://nx.dev">Nx</a> workspace. The
+            backend is based on <a href="https://nestjs.com">NestJS</a> using
+            <a href="https://www.postgresql.org">PostgreSQL</a> as a database
+            together with <a href="https://www.prisma.io">Prisma</a> and
+            <a href="https://redis.io">Redis</a> for caching. The frontend is
+            built with <a href="https://angular.io">Angular</a>.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">How to contribute?</h2>
+          <p>
+            Every contribution matters. This can be implementing new features,
+            fixing bugs, refactoring the code, improving the documentation,
+            adding more unit tests, or translating into another language.
+          </p>
+          <p>
+            Are you not yet familiar with our code base? That is not a problem.
+            We have applied the label <code>hacktoberfest</code> to a few
+            <a
+              href="https://github.com/ghostfolio/ghostfolio/issues?q=is%3Aissue+is%3Aopen+label%3Ahacktoberfest"
+              >issues</a
+            >
+            and
+            <a
+              href="https://github.com/ghostfolio/ghostfolio/discussions?discussions_q=label%3Ahacktoberfest"
+              >ideas</a
+            >
+            that are well suited for newcomers.
+          </p>
+          <p>
+            The official Hacktoberfest website provides some valuable
+            <a
+              href="https://hacktoberfest.com/participation/#beginner-resources"
+              >resources for beginners</a
+            >
+            to start contributing in open source.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">Get support</h2>
+          <p>
+            If you have further questions or ideas, please join our growing
+            <a href="https://ghostfolio.slack.com">Slack community</a> or get in
+            touch on Twitter
+            <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a> or by
+            email via <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a>.
+          </p>
+          <p>
+            We look forward to hearing from you.<br />
+            Thomas from Ghostfolio
+          </p>
+        </section>
+        <section class="mb-4">
+          <ul class="list-inline">
+            <li class="list-inline-item">
+              <span class="badge badge-light">Angular</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Community</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Cryptocurrency</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">ETF</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Finance</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Fintech</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Ghostfolio</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">GitHub</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Hacktoberfest</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Investment</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">NestJS</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Nx</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">October</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Open Source</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">OSS</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Personal Finance</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Portfolio</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Portfolio Tracker</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Prisma</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Software</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Stock</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">TypeScript</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Wealth</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Wealth Management</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Web3</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Web 3.0</span>
+            </li>
+          </ul>
+        </section>
+      </article>
+    </div>
+  </div>
+</div>
--- a/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.module.ts
+++ b/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.module.ts
@ -0,0 +1,13 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { Hacktoberfest2022RoutingModule } from './hacktoberfest-2022-page-routing.module';
+import { Hacktoberfest2022PageComponent } from './hacktoberfest-2022-page.component';
+
+@NgModule({
+  declarations: [Hacktoberfest2022PageComponent],
+  imports: [CommonModule, Hacktoberfest2022RoutingModule, RouterModule],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class Hacktoberfest2022PageModule {}
--- a/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.scss
+++ b/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.scss
@ -0,0 +1,3 @@
+:host {
+  display: block;
+}
--- a/apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page-routing.module.ts
+++ b/apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page-routing.module.ts
@ -2,14 +2,14 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';

-import { ReportPageComponent } from './report-page.component';
+import { BlackFriday2022PageComponent } from './black-friday-2022-page.component';

 const routes: Routes = [
  {
    canActivate: [AuthGuard],
-    component: ReportPageComponent,
+    component: BlackFriday2022PageComponent,
    path: '',
-    title: 'X-ray'
+    title: 'Black Friday 2022'
  }
 ];

@ -17,4 +17,4 @@ const routes: Routes = [
  imports: [RouterModule.forChild(routes)],
  exports: [RouterModule]
 })
-export class ReportPageRoutingModule {}
+export class BlackFriday2022RoutingModule {}
--- a/apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page.component.ts
+++ b/apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page.component.ts
@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { DataService } from '@ghostfolio/client/services/data.service';
+
+@Component({
+  host: { class: 'page' },
+  selector: 'gf-black-friday-2022-page',
+  styleUrls: ['./black-friday-2022-page.scss'],
+  templateUrl: './black-friday-2022-page.html'
+})
+export class BlackFriday2022PageComponent {
+  public discount: number;
+
+  public constructor(private dataService: DataService) {
+    const { subscriptions } = this.dataService.fetchInfo();
+
+    const coupon = subscriptions?.[0]?.coupon ?? 0;
+    const price = subscriptions?.[0]?.price ?? 1;
+
+    this.discount = Math.floor((coupon / price) * 100) / 100;
+  }
+}
--- a/apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page.html
+++ b/apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page.html
@ -0,0 +1,138 @@
+<div class="blog container">
+  <div class="row">
+    <div class="col-md-8 offset-md-2">
+      <article>
+        <div class="mb-4 text-center">
+          <h1 class="mb-1">Black Friday 2022</h1>
+          <div class="mb-3 text-muted"><small>2022-11-13</small></div>
+          <img
+            alt="Black Friday 2022 Teaser"
+            class="rounded w-100"
+            src="../assets/images/blog/black-friday-2022.jpg"
+            title="Black Friday 2022"
+          />
+        </div>
+        <section class="mb-4">
+          <p>
+            Get {{ discount | percent }} off on our
+            <strong>Ghostfolio Premium</strong>
+            <gf-premium-indicator
+              class="d-inline-block ml-1"
+              [enableLink]="false"
+            ></gf-premium-indicator>
+            annual plan for ambitious investors who need the full picture of
+            their financial assets.
+          </p>
+        </section>
+        <section class="mb-4">
+          <p>
+            <a
+              href="https://ghostfol.io"
+              title="Open Source Wealth Management Software"
+              >Ghostfolio</a
+            >
+            is a modern web application to manage your personal finance. The
+            software presents the current assets (stocks, ETFs,
+            cryptocurrencies, commodities etc.) in real time to make solid,
+            data-driven investment decisions. Check out the numerous
+            <a [routerLink]="['/features']">features</a> to manage your wealth.
+          </p>
+        </section>
+        <section class="mb-4">
+          <p>
+            Snap the limited Black Friday 2022 deal before it’s gone. For
+            detailed information on plans and pricing, please visit our
+            <a [routerLink]="['/pricing']">pricing page</a>.
+          </p>
+          <p class="text-center">
+            <a color="primary" mat-flat-button [routerLink]="['/pricing']"
+              >Get the Deal</a
+            >
+          </p>
+        </section>
+        <section class="mb-4">
+          <ul class="list-inline">
+            <li class="list-inline-item">
+              <span class="badge badge-light">2022</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Black Friday</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Cloud</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Cryptocurrency</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Deal</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">ETF</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Finance</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Fintech</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Ghostfolio</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Ghostfolio Premium</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Hosting</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Investment</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Open Source</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">OSS</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Personal Finance</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Portfolio</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Portfolio Tracker</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Pricing</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">SaaS</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Software</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Stock</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Subscription</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Wealth</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Wealth Management</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Web3</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Web 3.0</span>
+            </li>
+          </ul>
+        </section>
+      </article>
+    </div>
+  </div>
+</div>
--- a/apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page.module.ts
+++ b/apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page.module.ts
@ -0,0 +1,21 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { RouterModule } from '@angular/router';
+import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
+
+import { BlackFriday2022RoutingModule } from './black-friday-2022-page-routing.module';
+import { BlackFriday2022PageComponent } from './black-friday-2022-page.component';
+
+@NgModule({
+  declarations: [BlackFriday2022PageComponent],
+  imports: [
+    BlackFriday2022RoutingModule,
+    CommonModule,
+    GfPremiumIndicatorModule,
+    MatButtonModule,
+    RouterModule
+  ],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class BlackFriday2022PageModule {}
--- a/apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page.scss
+++ b/apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page.scss
@ -0,0 +1,3 @@
+:host {
+  display: block;
+}
--- a/apps/client/src/app/pages/blog/blog-page.component.ts
+++ b/apps/client/src/app/pages/blog/blog-page.component.ts
@ -1,4 +1,6 @@
 import { Component, OnDestroy } from '@angular/core';
+import { DataService } from '@ghostfolio/client/services/data.service';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { Subject } from 'rxjs';

@Component({
@ -8,9 +10,18 @@ import { Subject } from 'rxjs';
  templateUrl: './blog-page.html'
 })
 export class BlogPageComponent implements OnDestroy {
+  public hasPermissionForSubscription: boolean;
+
  private unsubscribeSubject = new Subject<void>();

-  public constructor() {}
+  public constructor(private dataService: DataService) {
+    const info = this.dataService.fetchInfo();
+
+    this.hasPermissionForSubscription = hasPermission(
+      info?.globalPermissions,
+      permissions.enableSubscription
+    );
+  }

  public ngOnDestroy() {
    this.unsubscribeSubject.next();
--- a/apps/client/src/app/pages/blog/blog-page.html
+++ b/apps/client/src/app/pages/blog/blog-page.html
@ -2,6 +2,54 @@
  <div class="mb-5 row">
    <div class="col">
      <h3 class="mb-3 text-center" i18n>Blog</h3>
+      <mat-card *ngIf="hasPermissionForSubscription" class="mb-3">
+        <mat-card-content>
+          <div class="container p-0">
+            <div class="flex-nowrap no-gutters row">
+              <a
+                class="d-flex w-100"
+                href="../en/blog/2022/11/black-friday-2022"
+              >
+                <div class="flex-grow-1">
+                  <div class="h6 m-0 text-truncate">Black Friday 2022</div>
+                  <div class="d-flex text-muted">2022-11-13</div>
+                </div>
+                <div class="align-items-center d-flex">
+                  <ion-icon
+                    class="chevron text-muted"
+                    name="chevron-forward-outline"
+                    size="small"
+                  ></ion-icon>
+                </div>
+              </a>
+            </div>
+          </div>
+        </mat-card-content>
+      </mat-card>
+      <mat-card class="mb-3">
+        <mat-card-content>
+          <div class="container p-0">
+            <div class="flex-nowrap no-gutters row">
+              <a
+                class="d-flex w-100"
+                href="../en/blog/2022/10/hacktoberfest-2022"
+              >
+                <div class="flex-grow-1">
+                  <div class="h6 m-0 text-truncate">Hacktoberfest 2022</div>
+                  <div class="d-flex text-muted">2022-10-01</div>
+                </div>
+                <div class="align-items-center d-flex">
+                  <ion-icon
+                    class="chevron text-muted"
+                    name="chevron-forward-outline"
+                    size="small"
+                  ></ion-icon>
+                </div>
+              </a>
+            </div>
+          </div>
+        </mat-card-content>
+      </mat-card>
      <mat-card class="mb-3">
        <mat-card-content>
          <div class="container p-0">
--- a/apps/client/src/app/pages/features/features-page.html
+++ b/apps/client/src/app/pages/features/features-page.html
@ -192,6 +192,17 @@
            </div>
          </mat-card>
        </div>
+        <div class="col-xs-12 col-md-4 mb-3">
+          <mat-card class="d-flex flex-column h-100">
+            <div class="flex-grow-1">
+              <h4>Multi-Language</h4>
+              <p class="m-0">
+                Use Ghostfolio in multiple languages: English, Dutch, German,
+                Italian and Spanish are currently supported.
+              </p>
+            </div>
+          </mat-card>
+        </div>
        <div class="col-xs-12 col-md-4 mb-3">
          <mat-card class="d-flex flex-column h-100">
            <div class="flex-grow-1">
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Kaul	4b74be50da	Release 1.214.0 (#1465 )	2022-11-19 12:15:22 +01:00
Thomas Kaul	0d338bb083	Bugfix/fix dynamic decimal places for cryptocurrencies in position detail dialog (#1464 ) * Fix dynamic decimal places * Update changelog	2022-11-19 12:13:02 +01:00
Thomas Kaul	b0d708fb82	Feature/change activities icons (#1463 ) * Improve icons * Update changelog	2022-11-19 11:28:26 +01:00
Thomas Kaul	be14458437	Bugfix/fix division by zero error in cash positions calculation (#1462 ) * Handle division by zero * Update changelog	2022-11-19 10:19:01 +01:00
Thomas Kaul	5978ddb80f	Feature/improve support for manual data source (#1460 ) * Improve support for MANUAL data source * Update changelog	2022-11-19 10:06:05 +01:00
Yash Solanki	18638dd1b7	Bugfix/Fix matsort not working in position detail dialog (#1457 ) * Fix matsort in position detail dialog * Update changelog Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	2022-11-19 10:02:36 +01:00
Thomas Kaul	81db3852e6	Feature/add sorting to accounts table (#1459 ) * Add sorting * Update changelog	2022-11-19 09:57:28 +01:00
Thomas Kaul	af27781234	Feature/upgrade prisma to version 4.6.1 (#1456 ) * Upgrade prisma to version 4.6.1 * Update changelog	2022-11-18 20:19:14 +01:00
Thomas Kaul	608e7a774d	Feature/improve activities tab icon (#1461 ) * Improve icon * Update changelog	2022-11-17 21:37:26 +01:00
Thomas Kaul	ed15eb76fd	Feature/upgrade yahoo finance2 to version 2.3.10 (#1458 ) * Upgrade yahoo-finance2 to version 2.3.10 * Update changelog	2022-11-16 19:33:07 +01:00
Thomas Kaul	39905e5046	Feature/upgrade yahoo finance2 to version 2.3.7 (#1455 ) * Upgrade yahoo-finance2 to version 2.3.7 * Update changelog	2022-11-15 21:33:22 +01:00
Thomas Kaul	7cd3f235df	Release 1.213.0 (#1454 )	2022-11-14 20:47:21 +01:00
Thomas Kaul	3b4f8c69bb	Feature/setup black friday 2022 deal (#1452 ) * Setup Black Friday 2022 deal * Update changelog	2022-11-14 20:45:41 +01:00
Thomas Kaul	c9bdf46b2b	Add PWA as feature (#1445 )	2022-11-12 17:21:37 +01:00
Thomas Kaul	4169de580b	Feature/add indicator for excluded accounts (#1450 ) * Add indicator for excluded accounts * Update changelog	2022-11-12 16:46:17 +01:00
Benjamin Pill	3317fe7c46	Fix missing comma in json body (API example) (#1446 )	2022-11-12 08:59:55 +01:00
Thomas Kaul	c8f6fdbaa3	Release 1.212.0 (#1444 )	2022-11-11 20:02:20 +01:00
Thomas Kaul	d95fc82f95	Feature/change view mode selector to slide toggle (#1443 ) * Change view mode selector to slide toggle * Update changelog	2022-11-11 20:01:08 +01:00
Thomas Kaul	31c949f9d2	Feature/upgrade nx to version 15.0.13 (#1442 ) * Upgrade Nx to version 15.0.13 * Update changelog	2022-11-11 19:44:32 +01:00
Thomas Kaul	f68f40fcc6	Release 1.211.0 (#1441 )	2022-11-11 16:53:36 +01:00
AlbertSalles	9623a363ed	Feature/convert into pwa (#1436 ) * Setup @angular/pwa	2022-11-11 16:50:23 +01:00
Thomas Kaul	2d42549967	Feature/improvements in pricing page (#1440 ) * Improve pricing page * Update changelog	2022-11-11 16:42:51 +01:00
Thomas Kaul	c934c5088b	Add ghostfolio-cli to community projects (#1437 )	2022-11-11 09:02:43 +01:00
Thomas Kaul	678b3cc57e	Add Buy me a coffee button (#1438 )	2022-11-10 19:31:00 +01:00
Johannes Herforth	cd5eb64a4c	Removed margin-bottom tag from the body element (#1435 ) - This only changes the behaviour in Firefox - All browsers now show the UI in a single page view	2022-11-09 20:48:13 +01:00
Thomas Kaul	fc1507de4f	Clean up (#1423 )	2022-11-09 10:08:36 +01:00
Thomas Kaul	d147a66dcd	Release 1.210.0 (#1434 )	2022-11-08 17:35:43 +01:00
Thomas Kaul	33fd1282e5	Bugfix/fix cash position in user currency (#1433 ) * Initialize cash positions with user currency * Update changelog	2022-11-08 17:32:50 +01:00
Thomas Kaul	693ff9d3ea	Setup pt (#1432 )	2022-11-07 17:17:07 +01:00
Thomas Kaul	21e87a0055	Clean up (#1431 )	2022-11-07 17:03:34 +01:00
Thomas Kaul	43426c9b01	Feature/restructure portfolio page (#1429 ) * Restructure portfolio page * Update changelog	2022-11-07 16:57:26 +01:00
Thomas Kaul	3b4da72ea3	Feature/tighten validation rule of base currency (#1428 ) * Tighten validation rule of BASE_CURRENCY * Update changelog	2022-11-06 17:51:31 +01:00
Thomas Kaul	8d8e55fd0b	Release 1.209.0 (#1427 )	2022-11-05 13:39:26 +01:00
Thomas Kaul	ca18621ce8	Improve locales (#1426 )	2022-11-05 12:49:17 +01:00
Thomas Kaul	b8574d24b2	Feature/improve usability of import (#1425 ) * Improve usability by adding expected file format * Update changelog	2022-11-05 12:22:24 +01:00
Thomas Kaul	6d12c27f9c	Feature/rename transactions to activities page (#1424 ) * Rename transactions to activities * Update changelog	2022-11-05 10:42:40 +01:00
Thomas Kaul	c2c5326049	Feature/add buy me a coffee badge to about page (#1422 ) * Add button: Buy me a coffee * Update changelog	2022-11-05 10:22:18 +01:00
Thomas Kaul	2a1339b61e	Feature/improve usage of premium indicator component (#1421 ) * Improve usage of premium indicator component * Update changelog	2022-11-05 09:12:41 +01:00
Thomas Kaul	c8a2579624	Feature/remove intro image in dark mode (#1420 ) * Remove intro image in dark mode * Update changelog	2022-11-05 09:06:40 +01:00
Thomas Kaul	832ae063df	Release 1.208.0 (#1415 )	2022-11-03 20:21:12 +01:00
Thomas Kaul	b5e026934f	Harmonize extension (before and after) (#1414 )	2022-11-03 20:18:40 +01:00
Yash Solanki	901c997908	Add pagination to activities table (#1404 ) * Add pagination to activities table	2022-11-03 20:16:30 +01:00
Thomas Kaul	3b6e0b20e2	Add test case (#1399 ) * Add test case * Fix calculation for portfolio evolution chart * Update changelog Co-Authored-By: gizmodus <11334553+gizmodus@users.noreply.github.com>	2022-11-03 20:06:16 +01:00
Thomas Kaul	e449d51c3c	Feature/restructure actions in admin control panel (#1410 ) * Restructure actions * Update changelog	2022-11-02 17:47:03 +01:00
Thomas Kaul	f72d31bab3	Release 1.207.0 (#1409 )	2022-10-31 20:27:52 +01:00
Thomas Kaul	4c893c4dcc	Bugfix/fix public page (#1408 ) * Fix public page * Update changelog	2022-10-31 20:25:42 +01:00
Thomas Kaul	ffb11cd10e	Add instructions for API Authorization (#1406 ) * Add instructions for API Authorization	2022-10-31 20:12:42 +01:00
Thomas Kaul	d424b7731e	Feature/change background color of dark mode (#1396 ) * Darken background color * Update changelog	2022-10-30 18:48:28 +01:00
Thomas Kaul	6043c87481	Simplify lead (#1401 )	2022-10-30 17:02:01 +01:00
Mitchell	fca0a688b6	parse csv date in ISO format (#1303 ) * Handle various date formats * Update changelog Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	2022-10-28 11:26:19 +02:00
Thomas Kaul	5c6cc4fed5	Handle division by zero (#1398 )	2022-10-26 21:28:26 +02:00
Thomas Kaul	64a7d38ff9	Add more translations (#1394 )	2022-10-23 10:28:08 +02:00
Thomas Kaul	68d0d39161	Feature/translate asset and asset sub classes (#1393 ) * Translate asset and asset sub classes * Update changelog	2022-10-22 07:47:05 +02:00
Thomas Kaul	233a8a8a18	Bugfix/improve loading indicator of investment chart (#1392 ) * Improve loading indicator * Update changelog	2022-10-21 20:01:32 +02:00
Thomas Kaul	190779ee35	Release 1.206.2 (#1391 )	2022-10-20 23:40:42 +02:00
Thomas Kaul	6ef8121561	Release 1.206.1 (#1390 )	2022-10-20 21:49:12 +02:00
Thomas Kaul	58bf57d1e6	Release 1.206.0 (#1389 )	2022-10-20 20:58:33 +02:00
Thomas Kaul	71c5412dd5	Add test case: sell partially with huge gain (#1380 ) * Add test case: sell partially with huge gain	2022-10-20 20:56:58 +02:00
Thomas Kaul	ae85398c3d	Fix test description (#1379 )	2022-10-20 20:48:40 +02:00
Thomas Kaul	048900d01b	Bugfix/improve performance calculation for sell activitities (#1388 ) * Improve performance calculation for SELL activities * Update changelog Co-authored-by: gizmodus <11334553+gizmodus@users.noreply.github.com>	2022-10-20 20:47:57 +02:00
Thomas Kaul	074b09b543	Add space (#1381 )	2022-10-19 07:53:58 +02:00
Thomas Kaul	f9e04022f4	Remove TWR calculation (#1377 )	2022-10-18 21:06:28 +02:00
Thomas Kaul	8fd1fbd44a	Feature/upgrade nx to version 15 (#1375 ) * Upgrade to Nx 15 * Update changelog	2022-10-18 20:05:58 +02:00
Thomas Kaul	0fb33ae71c	Feature/migrate angular.json to project.json (#1374 ) * Migrate angular.json to project.json * Update changelog	2022-10-17 20:41:13 +02:00
Yash Solanki	3a35d72ec2	Fix disabled placeholder color (#1365 )	2022-10-17 17:25:50 +02:00
Thomas Kaul	32fe3e195f	Release 1.205.2 (#1369 )	2022-10-16 20:49:28 +02:00
Thomas Kaul	805f4b05be	Release 1.205.1 (#1368 )	2022-10-16 20:19:27 +02:00
Thomas Kaul	5b51a6840a	Release 1.205.0 (#1367 )	2022-10-16 19:36:51 +02:00
Thomas Kaul	36bd6164e6	Feature/improve wording on landing page (#1366 ) * Improve wording * Update changelog	2022-10-16 19:35:09 +02:00
Thomas Kaul	eac52a215b	Feature/refactor appearance to color scheme (#1364 ) * Refactor appearance to colorScheme * Update changelog	2022-10-16 14:54:26 +02:00
Thomas Kaul	9ff8cd5471	Feature/improve portfolio evolution chart (#1362 ) * Switch inputs * Update changelog	2022-10-16 10:01:31 +02:00
Thomas Kaul	33cc7e4e7e	Feature/remove rakuten from data source (#1361 ) * Remove Rakuten * Update changelog	2022-10-16 09:42:18 +02:00
Thomas Kaul	47f84dab06	Remove postfix (#1360 )	2022-10-16 09:41:41 +02:00
Thomas Kaul	384d18b2a6	Feature/persist user language on url change (#1359 ) * Persist user language * Update changelog	2022-10-16 08:45:52 +02:00
Thomas Kaul	2363983bdc	Release 1.204.1 (#1357 )	2022-10-15 18:07:18 +02:00
Thomas Kaul	4af76764be	Release 1.204.0 (#1356 )	2022-10-15 17:47:35 +02:00
Thomas Kaul	a65424aafa	Feature/add total amount chart to investment timeline (#1344 ) * Add total amount chart * Update changelog	2022-10-15 17:45:34 +02:00
casitu	f9cd629470	Update messages.es.xlf (#1355 )	2022-10-15 17:44:20 +02:00
Thomas Kaul	ccb8c86596	Feature/minor improvements in chart components (#1353 ) * Move y axis to the right * Update changelog	2022-10-15 11:27:55 +02:00
Yash Solanki	246de7aa86	Consider current month in FIRE calculation (#1349 )	2022-10-15 10:45:11 +02:00
Thomas Kaul	a323313c71	Bugfix/fix alignment of value component on allocation page (#1351 ) * Fix alignment * Update changelog	2022-10-15 10:32:08 +02:00
Thomas Kaul	538c8947cd	Feature/rename data source from rakuten to rapid api (#1350 ) * Rename Rakuten to Rapid API * Update changelog	2022-10-15 10:31:46 +02:00
Thomas Kaul	1ec5fd12fe	Feature/setup prettier plugin organize attributes (#1346 ) * Setup prettier plugin: prettier-plugin-organize-attributes * Update changelog	2022-10-15 10:30:12 +02:00
Thomas Kaul	4376b8903e	Bugifx/fix url in blog posts (#1347 ) * Fix url * Update changelog	2022-10-14 19:52:00 +02:00
Thomas Kaul	a8e096f9ac	Feature/minor improvements for appearance selector (#1345 ) * Improve appearance selector * Update changelog	2022-10-12 13:38:58 +02:00
Logan Arnett	8e577592f6	Fix issue with $localize in storybook (#1343 )	2022-10-12 09:48:33 +02:00
Yash Solanki	c896bf9199	Add appearance option in settings (#1342 ) * Add appearance option in settings	2022-10-11 21:34:52 +02:00
Thomas Kaul	16145f18d9	Improve template (#1324 ) * Improve template	2022-10-09 10:42:02 +02:00
Thomas Kaul	5398da0dc8	Feature/simplify admin settings management (#1340 ) * Simplify settings management * Update changelog	2022-10-08 17:35:18 +02:00
Thomas Kaul	2466f4ff5d	Release 1.203.0 (#1338 )	2022-10-08 14:22:43 +02:00
Thomas Kaul	8f3a9bdfbb	Feature/refactor animation configuration (#1337 ) * Refactor animation configuration * Update changelog	2022-10-08 14:21:17 +02:00
Yash Solanki	44dfd2bd48	Add animation to line chart (#1328 )	2022-10-08 13:47:48 +02:00
Thomas Kaul	3fc2228f1d	Feature/switch to new performance calculation (#1336 ) * Switch to new performance calculation * Update changelog	2022-10-08 13:20:52 +02:00
Thomas Kaul	b018819a1f	Bugfix/fix todays performance and chart calculation (#1333 ) * Fix today's performance and chart calculation * Update changelog	2022-10-08 13:20:25 +02:00
Thomas Kaul	ac9311d783	Bugfix/fix alignment in users table (#1335 ) * Fix alignment * Update changelog	2022-10-08 11:38:58 +02:00
Thomas Kaul	e23ce0f35d	Feature/improve gui of benchmark comparator (#1334 ) * Improve GUI * Update changelog	2022-10-08 11:07:42 +02:00
alfredonodo	f4b52aa41c	Add Italian localization for the 4% rule (#1329 ) * Update messages.it.xlf	2022-10-08 11:05:53 +02:00
Thomas Kaul	655b040d4d	Add missing title (#1332 )	2022-10-07 20:54:05 +02:00
Thomas Kaul	0f637a5d0f	Release 1.202.0 (#1331 )	2022-10-07 20:49:57 +02:00
Thomas Kaul	3f85c327f5	Bugfix/fix text truncation in value component (#1330 ) * Fix text truncation * Update changelog	2022-10-07 20:48:39 +02:00
Thomas Kaul	c2df99072d	Feature/refactor filters (#1299 ) * Refactor filters Co-Authored-By: Zakaria YAHI <9142557+ZakYahi@users.noreply.github.com>	2022-10-07 20:39:29 +02:00
Thomas Kaul	e8afbcad9c	Feature/localize 4 percentage rule (#1327 ) * Setup translation for 4% rule * Update changelog	2022-10-07 20:21:52 +02:00
Thomas Kaul	e6d8de781b	Feature/improve wording in twitter bot service (#1326 ) * Improve wording * Update changelog	2022-10-06 20:52:34 +02:00
Thomas Kaul	6e1935899f	Bugfix/fix cryptocurrency symbols with less than 3 characters (#1325 ) * Fix cryptocurrency symbols with less than 3 characters * Update changelog	2022-10-06 15:15:36 +02:00
alfredonodo	169cb85b66	Improve Italian translation (#1318 ) * Update messages.it.xlf	2022-10-05 07:53:03 +02:00
casitu	fe6658d0ac	Update messages.es.xlf (#1319 )	2022-10-04 17:43:25 +02:00
Thomas Kaul	1f0381228e	Feature/improve caching of benchmarks (#1320 ) * Improve caching * Update changelog	2022-10-04 17:39:51 +02:00
Thomas Kaul	f4b63b5de5	Release 1.201.0 (#1313 )	2022-10-01 18:39:15 +02:00
casitu	e45a0ad068	Spanish (#1312 ) * Update messages.es.xlf	2022-10-01 18:36:41 +02:00
Thomas Kaul	81c6cc021d	Feature/add blog post hacktoberfest 2022 (#1310 ) * Add blog post: Hacktoberfest 2022 * Update changelog	2022-10-01 18:35:55 +02:00
Thomas Kaul	859b24aa5b	Fix alignment (#1311 )	2022-10-01 18:35:27 +02:00
casitu	2bc325f182	Update messages.es.xlf (#1305 ) * Update messages.es.xlf Co-authored-by: fdp10381 <63880387+fdp10381@users.noreply.github.com>	2022-10-01 16:45:44 +02:00
Thomas Kaul	a6186c23e2	Feature/improve usage of value component (#1308 ) * Improve usage of value component * Update changelog	2022-10-01 13:53:43 +02:00
Thomas Kaul	cf234003ec	Release 1.200.0 (#1307 )	2022-10-01 11:18:15 +02:00
Thomas Kaul	8d3954304e	Feature/add statistics section to landing page (#1306 ) * Add pulls on Docker Hub to statistics * Add statistics to landing page * Update changelog	2022-10-01 11:16:43 +02:00
Thomas Kaul	9562139fa6	Feature/upgrade prisma to version 4.4.0 (#1304 ) * Upgrade prisma to version 4.4.0 * Update changelog	2022-10-01 09:42:07 +02:00
Thomas Kaul	c857ea9a8f	Feature/add as seen in section on landing page (#1302 ) * Add as seen in section * Update changelog	2022-09-29 21:59:51 +02:00
Thomas Kaul	5c9fa71d95	Release 1.199.1 (#1301 )	2022-09-27 20:44:32 +02:00
Thomas Kaul	fefbfa31d1	Release 1.199.0 (#1300 )	2022-09-27 20:28:46 +02:00
Thomas Kaul	93a1fae51c	Feature/support sectors of mutual funds (#1298 ) * Support sectors * Update changelog Co-authored-by: Mitchell <5503199+m11tch@users.noreply.github.com>	2022-09-27 17:38:53 +02:00
Thomas Kaul	3715edd9ba	Extract locales (#1297 )	2022-09-26 19:44:19 +02:00
Thomas Kaul	e3916e1ba3	Feature/setup espanol (#1293 ) * Setup Español * Update changelog	2022-09-26 18:39:11 +02:00
Thomas Kaul	76ceac4edc	Add spanish translation (#1296 ) Co-Authored-By: alfredonodo <41476198+alfredonodo@users.noreply.github.com> Co-Authored-By: casitu <25199636+casitu@users.noreply.github.com>	2022-09-26 18:14:53 +02:00
Thomas Kaul	333b63bfe2	Release 1.198.0 (#1294 )	2022-09-25 21:46:19 +02:00
Mitchell	3006c21b12	Add dutch translation (#1291 ) * Add dutch translation	2022-09-25 18:12:33 +02:00
Thomas Kaul	f01a3f893d	Exclude accounts (#1289 ) * Exclude accounts * Update changelog	2022-09-25 18:02:46 +02:00
Thomas Kaul	72974e888f	Clean up spaces (#1288 )	2022-09-25 15:14:51 +02:00
Thomas Kaul	0cee7a0b35	Release 1.197.0 (#1287 )	2022-09-24 13:16:47 +02:00
Thomas Kaul	f3d337b044	Feature/add value of active filters on allocations page (#1286 ) * Add value * Update changelog	2022-09-24 13:15:16 +02:00
Thomas Kaul	7667af059c	Feature/combine performance and chart calculation (#1285 ) * Combine performance and chart calculation endpoints * Update changelog	2022-09-24 13:12:40 +02:00
Thomas Kaul	1095b47f45	Feature/add multi language support to feature overview (#1284 ) * Add multi-language support * Update changelog	2022-09-24 12:29:36 +02:00
Thomas Kaul	dacd7271eb	Feature/improve density of various selectors (#1283 ) * Improve density * Update changelog	2022-09-24 09:58:09 +02:00
Thomas Kaul	e093041184	Release 1.196.0 (#1281 )	2022-09-22 21:05:05 +02:00
Thomas Kaul	8f2caa508a	Feature/extend landing page (#1279 ) * Extend landing page * Update changelog	2022-09-22 20:52:46 +02:00
Thomas Kaul	862f670ccf	Feature/setup italiano (#1276 ) * Setup italiano * Update changelog	2022-09-22 20:52:03 +02:00
alfredonodo	54bf4c7a43	Update messages.it.xlf (#1280 )	2022-09-22 20:51:31 +02:00
				`@ -1 +0,0 @@`
				`export interface IRakutenRapidApiResponse {}`