diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b89e4e56a..c72d8b4098 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Added the _Return on Investment_ (ROI) as a performance calculation method
+
 ### Changed
 
 - Hardened the validation of the date in the endpoint to create an account balance
+- Enabled the selection of the performance calculation method in the user account settings
+- Improved the colors of the muted texts and borders by enabling the dark mode of `bootstrap`
+- Reduced the size of the global stylesheet by removing the unused utilities of `bootstrap`
 - Upgraded `bootstrap` from version `4.6.2` to `5.3.8`
 
 ### Fixed
diff --git a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
index d40249cafb..eeeb461c03 100644
--- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
+++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
@@ -159,6 +159,16 @@
           title="Return on Average Investment (total return with dividends)"
           >(ROAI)</abbr
         >
+      } @else if (
+        user?.settings?.performanceCalculationType ===
+        PerformanceCalculationType.ROI
+      ) {
+        <abbr
+          class="d-none d-sm-inline-block initialism ms-2 text-muted"
+          i18n-title
+          title="Return on Investment (total return with dividends)"
+          >(ROI)</abbr
+        >
       }
     </div>
     <div class="flex-column flex-wrap justify-content-end">
diff --git a/apps/client/src/app/components/user-account-settings/user-account-settings.html b/apps/client/src/app/components/user-account-settings/user-account-settings.html
index 055276129a..14d98bb1e3 100644
--- a/apps/client/src/app/components/user-account-settings/user-account-settings.html
+++ b/apps/client/src/app/components/user-account-settings/user-account-settings.html
@@ -30,32 +30,32 @@
               </mat-form-field>
             </div>
           </div>
-          @if (user?.settings?.isExperimentalFeatures && !user?.subscription) {
-            <div class="d-flex mb-2">
-              <div class="align-items-center d-flex pe-1 pt-1 w-50">
-                <ng-container i18n>Performance Calculation</ng-container>
-              </div>
-              <div class="ps-1 w-50">
-                <mat-form-field appearance="outline" class="w-100 without-hint">
-                  <mat-select
-                    name="performanceCalculationType"
-                    [disabled]="true"
-                    [value]="user.settings.performanceCalculationType"
-                    (selectionChange)="
-                      onChangeUserSetting(
-                        'performanceCalculationType',
-                        $event.value
-                      )
-                    "
+          <div class="d-flex mb-2">
+            <div class="align-items-center d-flex pe-1 pt-1 w-50">
+              <ng-container i18n>Performance Calculation</ng-container>
+            </div>
+            <div class="ps-1 w-50">
+              <mat-form-field appearance="outline" class="w-100 without-hint">
+                <mat-select
+                  name="performanceCalculationType"
+                  [value]="user.settings.performanceCalculationType"
+                  (selectionChange)="
+                    onChangeUserSetting(
+                      'performanceCalculationType',
+                      $event.value
+                    )
+                  "
+                >
+                  <mat-option value="ROAI"
+                    >Return on Average Investment (ROAI)</mat-option
                   >
-                    <mat-option value="ROAI"
-                      >Return on Average Investment (ROAI)</mat-option
-                    >
-                  </mat-select>
-                </mat-form-field>
-              </div>
+                  <mat-option value="ROI"
+                    >Return on Investment (ROI)</mat-option
+                  >
+                </mat-select>
+              </mat-form-field>
             </div>
-          }
+          </div>
           <div class="align-items-center d-flex mb-2">
             <div class="pe-1 w-50">
               <div i18n>Language</div>
diff --git a/apps/client/src/app/pages/faq/overview/faq-overview-page.html b/apps/client/src/app/pages/faq/overview/faq-overview-page.html
index fd94810a30..145479fc32 100644
--- a/apps/client/src/app/pages/faq/overview/faq-overview-page.html
+++ b/apps/client/src/app/pages/faq/overview/faq-overview-page.html
@@ -48,12 +48,16 @@
           >
         </mat-card-header>
         <mat-card-content
-          >Ghostfolio uses the <i>Return on Average Investment</i> (ROAI)
-          calculation method based on the average amount of capital invested
-          over time. ROAI aims to provide a more insightful view of investment
-          performance than simpler approaches, especially when contributions are
-          made over time. Dividends are included in the calculation (total
-          return).</mat-card-content
+          >Ghostfolio offers two calculation methods, which you can select in
+          the settings of your account. The
+          <i>Return on Average Investment</i> (ROAI) is based on the average
+          amount of capital invested over time. ROAI aims to provide a more
+          insightful view of investment performance than simpler approaches,
+          especially when contributions are made over time. The
+          <i>Return on Investment</i> (ROI) relates the performance to the total
+          amount of all purchases, which makes it easy to compare with the
+          statements of your broker. Dividends are included in both calculations
+          (total return).</mat-card-content
         >
       </mat-card>
       <mat-card appearance="outlined" class="mb-3">
diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
index 255ede038a..9c515ae0a3 100644
--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
@@ -264,6 +264,16 @@
                   title="Return on Average Investment (total return with dividends)"
                   >(ROAI)</abbr
                 >
+              } @else if (
+                user?.settings?.performanceCalculationType ===
+                PerformanceCalculationType.ROI
+              ) {
+                <abbr
+                  class="d-none d-sm-inline-block initialism ms-2 text-muted"
+                  i18n-title
+                  title="Return on Investment (total return with dividends)"
+                  >(ROI)</abbr
+                >
               }
             </div>
             <div class="d-flex justify-content-end">