diff --git a/README.md b/README.md
index 4842d8ebbb1..ba579aea833 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ As a modern Python-based environment, OpenBBTerminal opens access to numerous Py
If you wish to install the Terminal, there are currently four options:
-- [Using the Installer](openbb_terminal/README.md#User) (recommended if you just want to use the terminal)
+- [Using the Installer](https://openbb-finance.github.io/OpenBBTerminal/terminal/#accessing-the-openbb-terminal) (recommended if you just want to use the terminal)
- [Using Python](openbb_terminal/README.md#anaconda--python) (recommended if you want to develop new features)
- [Using Docker](openbb_terminal/README.md#Docker-Installation) (alternative option to the installer if preferred)
- [Using Docker Web UI](openbb_terminal/README.md#web-ui---docker) (if you want to deploy the web UI for users to access
diff --git a/guides/portfolio/portfolio_optimization/sub_level_template.md b/guides/portfolio/portfolio_optimization/sub_level_template.md
index bc30166007e..2c4545c9874 100644
--- a/guides/portfolio/portfolio_optimization/sub_level_template.md
+++ b/guides/portfolio/portfolio_optimization/sub_level_template.md
@@ -6,6 +6,7 @@ type: our story
status: publish
excerpt: "The Introduction to ENTER_MENU_NAME_HERE within the ENTER_TOP_LEVEL_MENU_NAME_HERE explains how to use the
ENTER_MENU_NAME_HERE and provides a brief description of its sub-menus"
+geekdocCollapseSection: true
---
**Important Rules**
@@ -20,6 +21,7 @@ Each page should always take the following rules in mind:
- Every link should open a new page (`_blank`). So use: `exp`
- Some methods to format images:
+ - Include a link tot the image as well, e.g: `
`
- Side by side: `
`
- Text and image:
```
@@ -36,8 +38,6 @@ Each page should always take the following rules in mind:
```
- No formatting in particular: ``
_____
-
-
`
- Side by side: `
`
- Text and image:
```
@@ -36,8 +38,6 @@ Each page should always take the following rules in mind:
```
- No formatting in particular: ``
_____
-
-
-If you want to install the terminal using Python ignore the User section and jump to
-Anaconda & Python section.
-
-## User
-
-If you are interested in running the terminal via the installer, these steps will guide you through the installation
-process and explain to you what each message means.
-
-### Windows
-
-The process starts off by downloading the installer, see below for how to download the most recent release:
-
-- Go to [the following link](https://github.com/OpenBB-finance/OpenBBTerminal/releases)
-- Click on the most recent release
-- Click on the ".exe" file:
-
-Then follow these steps:
-
-| Installation instructions | Illustration |
-| :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------ |
-| 


-
-| Note about "Cannot check it for malicious software" warning | Illustration |
-| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------- |
-| 


-
-Then, by typing the command on the left-hand side, followed by your API Key, you can set the key and use the commands
-attached to it.
-
-
-
-When you have installed the terminal through Anaconda & Python, you can use the environment variable to set your
-API Keys directly instead of using the Terminal, for the variable name in the code one just needs to
-remove the "GT\_", this can be found in [config_terminal.py](/openbb_terminal/config_terminal.py).
+You can also use the environment variable to set your API Keys directly instead of using the Terminal, for the variable
+name in the code one just needs to remove the "GT\_", this can be found in [config_terminal.py](/openbb_terminal/config_terminal.py).
| Website | Environment Variables |
| :--------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
diff --git a/portfolio/allocation/OpenBB_Portfolio_Template_v1.0.0.xlsx b/portfolio/allocation/OpenBB_Portfolio_Template_v1.0.0.xlsx
index c22167c78a7..8dfbece9815 100644
Binary files a/portfolio/allocation/OpenBB_Portfolio_Template_v1.0.0.xlsx and b/portfolio/allocation/OpenBB_Portfolio_Template_v1.0.0.xlsx differ
diff --git a/routines/comparison_demo.openbb b/routines/comparison_demo.openbb
new file mode 100644
index 00000000000..7511372fcce
--- /dev/null
+++ b/routines/comparison_demo.openbb
@@ -0,0 +1,53 @@
+# Select location folder to export data to (if doesn't exist, will be created by default)
+# export didier_analysis_on_$ARGV[0]
+
+# Go into the stocks context
+stocks
+
+# Load a ticker that's given as a first argument of the routine
+load WMT
+
+# Go into the Comparison Analysis Menu
+ca
+
+# Get similar companies
+getfinnhub
+getfinviz
+getpoly
+
+# Remove and add a ticker
+rmv JCP
+add SHOP
+
+# Show a correlation matrix with different periods.
+hcorr
+hcorr -s 2022-01-01
+
+# Compare valuations
+valuation
+
+# Compare performance
+performance
+
+# Sentiment of companaies over the last ten days
+sentiment
+
+# Chart the NASDAQ 100 Index with futures contracts
+..
+..
+stocks
+ca
+set ^NDX,NQH23.CME,NQZ22.CME,NQ=F
+historical -s 2022-01-01
+
+# Show the price-normalized history of S&P, NASDAQ, and Bitcoin futures
+set ES=F,NQ=F,BTC=F
+historical -n
+
+# Compare financial statements of the ten largest US Banks
+set C,USB,WFC,JPM,TD,GS,PNC,TFC,BAC,COF
+cashflow
+income
+
+# Take the list of similar companies to the Portfolio Optimization Menu
+po
\ No newline at end of file
diff --git a/routines/darkpool_demo.openbb b/routines/darkpool_demo.openbb
new file mode 100644
index 00000000000..956afa7672d
--- /dev/null
+++ b/routines/darkpool_demo.openbb
@@ -0,0 +1,48 @@
+# Select location folder to export data to (if doesn't exist, will be created by default)
+# export didier_analysis_on_$ARGV[0]
+
+# Go into the stocks context
+stocks
+
+# Navigate to Dark Pools and Short Data Menu
+dps
+
+# Show the most shorted stocks on Yahoo Finance
+shorted
+
+# Show the stocks with the highest short interest on https://highshortinterest.com
+hsi
+
+# Get the top five NMS and OTCE symbols with increasing dark pool volume from https://otctransparency.finra.org/otctransparency/AtsIssueData
+prom -n 50 -l 5 -t T1
+prom -n 50 -l 5 -t T2
+prom -n 50 -l 5 -t OTCE
+
+# Show the top 25 largest Dark Pool positions from https://stockgrid.io
+pos -l 25
+pos -l 25 -a
+
+# Get the Cost-to-Borrow List
+ctb
+
+# Get the days-to-cover list and sort
+sidtc -s si
+sidtc
+
+# Load Apple as a ticker
+load AAPL
+
+# Short Volume vs Position
+spos
+
+# Price vs. Short Interest
+psi
+
+# Get two years of FTD data
+ftd -s 2020-05-30
+
+# Bar graph of Dark Pool and OTC volume
+dpotc
+
+# Export the Cost-to-Borrow list as a spreadsheet to examine.
+ctb -n 6000 --export xlsx
\ No newline at end of file
diff --git a/website/content/terminal/_index.md b/website/content/terminal/_index.md
index f426aad069a..13b0bf9942d 100644
--- a/website/content/terminal/_index.md
+++ b/website/content/terminal/_index.md
@@ -50,7 +50,7 @@ and portfolio managers.
The OpenBB Terminal can be directly installed on your computer via our installation program. Within this section, you
are guided through the installation process and how to launch the program. If you are a developer, please have a
look here. If you struggle with the
-installation process, please don't hesitate to reach us on Discord
+installation process, please don't hesitate to reach us on Discord
or visit our contact page.
### Installation for Windows
@@ -136,7 +136,7 @@ will see a command named load. To unde
2022 May 19, 05:27 (π¦) /stocks/ $ load -h
usage: load [-t TICKER] [-s START] [-e END] [-i {1,5,15,30,60}] [--source {yf,av,iex,polygon}] [-p] [-f FILEPATH] [-m] [-w] [-r {ytd,1y,2y,5y,6m}] [-h]
-Load stock ticker to perform analysis on. When the data source is syf', an Indian ticker can be loaded by using '.NS' at the end, e.g. 'SBIN.NS'. See available market in https://help.yahoo.com/kb/exchanges-data-providers-yahoo-finance-sln2310.html.
+Load stock ticker to perform analysis on. When the data source is yf (Yahoo Finance), an Indian ticker can be loaded by using '.NS'at the end, e.g. 'SBIN.NS'. See available market in https://help.yahoo.com/kb/exchanges-data-providers-yahoo-finance-sln2310.html.
optional arguments:
-t TICKER, --ticker TICKER
@@ -310,5 +310,5 @@ question) and message in the form although this can also be set directly from in
Alternatively, you can contact us via the following routes:
- If you notice that a feature is missing inside the terminal, please fill in the Request a Feature form.
-- If you wish to report a bug, have a question/suggestion or anything else, please fill in the Support form.
-- If you wish to speak to us directly, please contact us via Discord.
+- If you wish to report a bug, have a question/suggestion or anything else, please fill in the Support form.
+- If you wish to speak to us directly, please contact us via Discord.
diff --git a/website/content/terminal/portfolio/po/_index.md b/website/content/terminal/portfolio/po/_index.md
index 407539f4df3..b4ea914bc31 100644
--- a/website/content/terminal/portfolio/po/_index.md
+++ b/website/content/terminal/portfolio/po/_index.md
@@ -1,52 +1,417 @@
---
+title: Introduction to Portfolio Optimization
+keywords: "portfolio, optimization, mean variance, risk parity, black litterman, mean risk,
+hierarchical clustering models"
+excerpt: "The Introduction to Portfolio Optimization within the Portfolio menu explains how to use various portfolio
+optimization techniques and provides a brief description of its sub-menus"
geekdocCollapseSection: true
---
+The Portfolio Optimization menu allows the user to apply advanced optimization techniques to a portfolio of any type
+and of any size. It does so by introducing a multitude of optimization techniques ranging from mean-variance optimization
+to risk parity models and
+hierarchical clustering models.
+By providing Excel templates, the user can make sense of the vast array of parameters that each command has. E.g. think
+of the historic period you wish to use or which of the more than 10 risk measures and covariance methods should be used?
+These are questions the templates make easier to answer.
-The terminal has incorporated Riskfolio-Lib. Refer to the documentation here:
- file select portfolio parameter file
-> params specify and show portfolio risk parameters
- load load tickers and categories from .xlsx or .csv file
+This menu requires the usage of the Excel templates to work properly. As there is a lot of complexity involved around
+these techniques, these templates allow the user to understand what values for each parameter are actually used and
+allow for an easy way to define the allocation.
-Portfolio Optimization:
- add add tickers to the list of the tickers to be optimized
- rmv remove tickers from the list of the tickers to be optimized
- show show selected portfolios and categories from the list of saved portfolios
- rpf remove portfolios from the list of saved portfolios
- plot plot selected charts from the list of saved portfolios
+For this there are two templates that need to be set:
+- **OpenBB Parameters Template**: found in the OpenBB Terminal directory within `OpenBB Terminal/OpenBB/portfolio/parameters`
+- **OpenBB Portfolio Template**: found in the OpenBB Terminal directory within `OpenBB Terminal/OpenBB/portfolio/allocation`
-Tickers: BLL, CLX, CSCO, DE, HD, IBM, MAS, MTB, OKE, PCG, RCL, SCHW, SYY, VZ, XRAY
-Categories: ASSET_CLASS, SECTOR, INDUSTRY, COUNTRY, CURRENT_INVESTED_AMOUNT, CURRENCY
-Portfolios: MINRISK_0, MAXSHARPE_1
+If this location does not exist, use this link
+to download the most recent versions and place the contents inside a folder named `portfolio` within the `OpenBB Terminal/OpenBB` directory.
-Mean Risk Optimization:
- maxsharpe maximal Sharpe ratio portfolio (a.k.a the tangency portfolio)
- minrisk minimum risk portfolio
- maxutil maximal risk averse utility function, given some risk
- aversion parameter
- maxret maximal return portfolio
- maxdiv maximum diversification portfolio
- maxdecorr maximum decorrelation portfolio
- blacklitterman black litterman portfolio
- ef show the efficient frontier
+### OpenBB Parameters Template
+This template provides the user with the ability to set define values for each parameter based on the optimization
+technique that is deployed. E.g. if you select `riskparity` for the `technique` parameter, you will notice that some
+parameters turn grey. This means that the parameter is irrelevant for the selected
+method.
-Risk Parity Optimization:
- riskparity risk parity portfolio using risk budgeting approach
- relriskparity relaxed risk parity using least squares approach
+The OpenBB Terminal does, however, allow the user to run any model despite the `technique` you selected. Therefore, if
+you are interested in running multiple models, consider removing the value for `technique`. Do note that this makes it
+more difficult to understand which values are used for which model.
-Hierarchical Clustering Models:
- hrp hierarchical risk parity
- herc hierarchical equal risk contribution
- nco nested clustering optimization
+
-Other Optimization Techniques:
- equal equally weighted
- mktcap weighted according to market cap (property marketCap)
- dividend weighted according to dividend yield (property dividendYield)
- property weight according to selected info property
+Once you have defined the parameters, save the template and load it inside the terminal by using the file
+command. If done correctly, the parameters file should show automatically after typing `file` and pressing SPACE. Then, by using the DOWN KEY (β)
+you can select the file by pressing ENTER (β) which will then be loaded into the terminal:
+
+````
+2022 May 02, 06:51 (π¦) /portfolio/po/ $ file OpenBB_Parameters_Template v1.0.0.xlsx
+Parameters:
+ historic_period : 3y
+ log_returns : 0
+ return_frequency : d
+ max_nan : 0.05
+ threshold_value : 0.3
+ nan_fill_method : time
+ risk_free : 0.003
+ significance_level : 0.05
+ risk_measure : MV
+ target_return : -1
+ target_risk : -1
+ expected_return : hist
+ covariance : hist
+ smoothing_factor_ewma : 0.94
+ long_allocation : 1
+ short_allocation : 0
+````
+
+### OpenBB Portfolio Template
+This template hands the user a format to work with it to define the portfolio. Here, categorization is applied
+based on asset class, sector, industry, country and currency. By using the dropdown menus within this Excel, you
+are able to apply the proper categorization. This is based on the same methodology as found in other areas of the
+terminal.
+
+
+
+You can load in the portfolio template by using the load command:
+
+```
+2022 Apr 26, 01:35 (π¦) /portfolio/po/ $ load OpenBB_Portfolio_Template_v1.0.0.xlsx
+2022 Apr 26, 02:15 (π¦) /portfolio/po/ $ show
+
+Current Portfolios: None
+
+Current Categories: ASSET_CLASS, SECTOR, INDUSTRY, COUNTRY, CURRENT_INVESTED_AMOUNT, CURRENCY
```
-{{< toc-tree >}}
\ No newline at end of file
+### Performing optimization
+Based on the parameters and allocation the user has set, the optimization process begins. What optimization
+technique is ideal depends entirely on the user's risk profile and objectives. As an illustration,
+Risk Parity
+is presented below via the riskparity
+command:
+
+```
+2022 May 30, 05:47 (π¦) /portfolio/po/ $ riskparity
+Optimization can take time. Please be patient...
+
+ [3 Years] Risk parity portfolio based on risk budgeting approach
+using volatility as risk measure
+
+
+ Weights
+βββββββββ³βββββββββββ
+β β Value β
+β‘βββββββββββββββββββ©
+β AAPL β 3.27 % β
+βββββββββΌβββββββββββ€
+β AMZN β 3.81 % β
+βββββββββΌβββββββββββ€
+β APTV β 2.17 % β
+βββββββββΌβββββββββββ€
+β ASML β 2.48 % β
+βββββββββΌβββββββββββ€
+β BABA β 3.42 % β
+βββββββββΌβββββββββββ€
+β GOOGL β 3.54 % β
+βββββββββΌβββββββββββ€
+β HYG β 9.40 % β
+βββββββββΌβββββββββββ€
+β IYR β 3.98 % β
+βββββββββΌβββββββββββ€
+β NKE β 3.66 % β
+βββββββββΌβββββββββββ€
+β PEX β 3.88 % β
+βββββββββΌβββββββββββ€
+β PSP β 3.49 % β
+βββββββββΌβββββββββββ€
+β REZ β 4.08 % β
+βββββββββΌβββββββββββ€
+β TIP β 26.61 % β
+βββββββββΌβββββββββββ€
+β TLT β 22.86 % β
+βββββββββΌβββββββββββ€
+β TSM β 3.35 % β
+βββββββββ΄βββββββββββ
+
+Annual (by 252) expected return: 10.03%
+Annual (by β252) volatility: 11.62%
+Sharpe ratio: 0.8373
+```
+To understand how this portfolio differs from the original portfolio, the show
+command can be used. This also shows the allocations to each asset class, sector, industry and currency. Using the
+optimized portfolio, this generates the following results:
+
+```
+2022 May 30, 05:47 (π¦) /portfolio/po/ $ show RP_0
+
+Portfolio - RP_0
+
+ Category - Asset_Class
+βββββββ³βββββββββββββββββ³ββββββββββββββββββββββββββ³ββββββββββββββββββ³βββββββββββ
+β β Asset_Class β Current_Invested_Amount β Current_Weights β Value β
+β‘ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ©
+β USD β FIXED INCOME β 2,550,000 $ β 30.03 % β 58.87 % β
+βββββββΌβββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β PRIVATE EQUITY β 850,000 $ β 10.01 % β 7.37 % β
+βββββββΌβββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β PUBLIC EQUITY β 4,242,000 $ β 49.95 % β 25.69 % β
+βββββββΌβββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β REAL ESTATE β 850,000 $ β 10.01 % β 8.07 % β
+βββββββΌβββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β TOTAL USD β 8,492,000 $ β 100.00 % β 100.00 % β
+βββββββ΄βββββββββββββββββ΄ββββββββββββββββββββββββββ΄ββββββββββββββββββ΄βββββββββββ
+
+
+
+ Category - Country
+βββββββ³ββββββββββββββββ³ββββββββββββββββββββββββββ³ββββββββββββββββββ³βββββββββββ
+β β Country β Current_Invested_Amount β Current_Weights β Value β
+β‘βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ©
+β USD β CHINA β 246,000 $ β 2.90 % β 3.42 % β
+βββββββΌββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β NETHERLANDS β 920,000 $ β 10.83 % β 2.48 % β
+βββββββΌββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β TAIWAN β 380,000 $ β 4.47 % β 3.35 % β
+βββββββΌββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β UNITED STATES β 6,946,000 $ β 81.79 % β 90.76 % β
+βββββββΌββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β TOTAL USD β 8,492,000 $ β 100.00 % β 100.00 % β
+βββββββ΄ββββββββββββββββ΄ββββββββββββββββββββββββββ΄ββββββββββββββββββ΄βββββββββββ
+
+
+
+ Category - Sector
+βββββββ³βββββββββββββββββββββββββ³ββββββββββββββββββββββββββ³ββββββββββββββββββ³βββββββββββ
+β β Sector β Current_Invested_Amount β Current_Weights β Value β
+β‘ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ©
+β USD β COMMUNICATION SERVICES β 636,000 $ β 7.49 % β 3.54 % β
+βββββββΌβββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β CONSUMER CYCLICAL β 1,926,000 $ β 22.68 % β 13.06 % β
+βββββββΌβββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β CORPORATE BOND β 810,000 $ β 9.54 % β 9.40 % β
+βββββββΌβββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β FINANCIAL β 850,000 $ β 10.01 % β 7.37 % β
+βββββββΌβββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β GOVERNMENT BOND β 1,740,000 $ β 20.49 % β 49.47 % β
+βββββββΌβββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β REAL ESTATE β 850,000 $ β 10.01 % β 8.07 % β
+βββββββΌβββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β TECHNOLOGY β 1,680,000 $ β 19.78 % β 9.09 % β
+βββββββΌβββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β TOTAL USD β 8,492,000 $ β 100.00 % β 100.00 % β
+βββββββ΄βββββββββββββββββββββββββ΄ββββββββββββββββββββββββββ΄ββββββββββββββββββ΄βββββββββββ
+
+
+
+ Category - Industry
+βββββββ³βββββββββββββββββββββββββββββββββββββββββββββ³ββββββββββββββββββββββββββ³ββββββββββββββββββ³βββββββββββ
+β β Industry β Current_Invested_Amount β Current_Weights β Value β
+β‘ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ©
+β USD β AUTO PARTS & EQUIPMENT β 429,000 $ β 5.05 % β 2.17 % β
+βββββββΌβββββββββββββββββββββββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β FINANCIAL SERVICES β 850,000 $ β 10.01 % β 7.37 % β
+βββββββΌβββββββββββββββββββββββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β FOOTWEAR & ACCESSORIES β 505,000 $ β 5.95 % β 3.66 % β
+βββββββΌβββββββββββββββββββββββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β HIGH YIELD BOND β 810,000 $ β 9.54 % β 9.40 % β
+βββββββΌβββββββββββββββββββββββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β INFLATION-PROTECTED BOND β 890,000 $ β 10.48 % β 26.61 % β
+βββββββΌβββββββββββββββββββββββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β INTERACTIVE MEDIA & SERVICES β 636,000 $ β 7.49 % β 3.54 % β
+βββββββΌβββββββββββββββββββββββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β INTERNET & DIRECT MARKETING RETAIL β 992,000 $ β 11.68 % β 7.23 % β
+βββββββΌβββββββββββββββββββββββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β LONG GOVERNMENT β 850,000 $ β 10.01 % β 22.86 % β
+βββββββΌβββββββββββββββββββββββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β RESIDENTIAL β 280,000 $ β 3.30 % β 4.08 % β
+βββββββΌβββββββββββββββββββββββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β SEMICONDUCTORS β 1,300,000 $ β 15.31 % β 5.82 % β
+βββββββΌβββββββββββββββββββββββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β TECHNOLOGY HARDWARE, STORAGE & PERIPHERALS β 380,000 $ β 4.47 % β 3.27 % β
+βββββββΌβββββββββββββββββββββββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β TOTAL MARKET β 570,000 $ β 6.71 % β 3.98 % β
+βββββββΌβββββββββββββββββββββββββββββββββββββββββββββΌββββββββββββββββββββββββββΌββββββββββββββββββΌβββββββββββ€
+β USD β TOTAL USD β 8,492,000 $ β 100.00 % β 100.00 % β
+βββββββ΄βββββββββββββββββββββββββββββββββββββββββββββ΄ββββββββββββββββββββββββββ΄ββββββββββββββββββ΄βββββββββββ
+```
+
+It is possible to use the commands without loading in the parameters template or by using the parameters template but
+changing some arguments directly into the terminal. For example, using the same method as described above, the risk
+measure is changed to Conditional Value at Risk (CVaR)
+and the used historic period is increased to 10 years (keeping all other parameters unchanged):
+
+```
+2022 May 30, 05:47 (π¦) /portfolio/po/ $ riskparity -rm CVaR -p 10y
+Optimization can take time. Please be patient...
+
+ [10 Years] Risk parity portfolio based on risk budgeting approach
+using conditional value at risk (CVaR) as risk measure
+
+
+ Weights
+βββββββββ³βββββββββββ
+β β Value β
+β‘βββββββββββββββββββ©
+β AAPL β 3.78 % β
+βββββββββΌβββββββββββ€
+β AMZN β 3.55 % β
+βββββββββΌβββββββββββ€
+β APTV β 3.06 % β
+βββββββββΌβββββββββββ€
+β ASML β 3.11 % β
+βββββββββΌβββββββββββ€
+β GOOGL β 3.80 % β
+βββββββββΌβββββββββββ€
+β HYG β 11.68 % β
+βββββββββΌβββββββββββ€
+β IYR β 4.68 % β
+βββββββββΌβββββββββββ€
+β NKE β 4.31 % β
+βββββββββΌβββββββββββ€
+β PSP β 4.54 % β
+βββββββββΌβββββββββββ€
+β REZ β 4.91 % β
+βββββββββΌβββββββββββ€
+β TIP β 29.23 % β
+βββββββββΌβββββββββββ€
+β TLT β 19.69 % β
+βββββββββΌβββββββββββ€
+β TSM β 3.66 % β
+βββββββββ΄βββββββββββ
+
+Annual (by 252) expected return: 9.70%
+Annual (by β252) volatility: 8.34%
+Sharpe ratio: 1.1275
+Annual (by β252) conditional value at risk (CVaR) : 19.84%
+Return / conditional value at risk (CVaR) ratio: 0.4738
+```
+
+## Examples
+To demonstrate the capabilities of the Portfolio Optimization menu, the entire S&P 500 index (as of 30th of May 2022)
+is used and optimized and analysed in a variety of ways. Starting by loading in the dataset, which is visible when
+you type `load` as it resides in the same directory as the earlier mentioned template:
+
+
+
+It is possible to load the parameters template here but this is not necessary as each parameter has a default
+value set regardless. However, because the Excel file provides a more structured way of presenting the choices, the
+template is loaded in:
+```
+2022 May 30, 06:15 (π¦) /portfolio/po/ $ file OpenBB_Parameters_Template_v1.0.0.xlsx
+Parameters:
+ historic_period : 3y
+ log_returns : 0
+ return_frequency : d
+ max_nan : 0.05
+ threshold_value : 0.3
+ nan_fill_method : time
+ risk_free : 0.003
+ significance_level : 0.05
+ risk_measure : MV
+ target_return : -1
+ target_risk : -1
+ expected_return : hist
+ covariance : hist
+ smoothing_factor_ewma : 0.94
+ long_allocation : 1
+ short_allocation : 0
+```
+
+Then, the Hierarchical Risk Parity technique is applied by running the hrp
+command. This results in the following (the result is edited, as it would show 500 tickers, to prevent flooding this page):
+```
+2022 May 30, 06:22 (π¦) /portfolio/po/ $ hrp
+Optimization can take time. Please be patient...
+
+ [3 Years] Hierarchical risk parity portfolio using pearson codependence,
+single linkage and volatility as risk measure
+
+
+ Weights
+βββββββββ³βββββββββββ
+β β Value β
+β‘βββββββββββββββββββ©
+β A β 0.23 % β
+βββββββββΌβββββββββββ€
+β AAL β 0.04 % β
+βββββββββΌβββββββββββ€
+β AAP β 0.21 % β
+βββββββββΌβββββββββββ€
+β AAPL β 0.15 % β
+βββββββββΌβββββββββββ€
+β ABBV β 0.41 % β
+βββββββββΌβββββββββββ€
+β ABC β 0.18 % β
+βββββββββΌβββββββββββ€
+
+
+Further analysis can be done by looking at the portfolio's returns histogram
+which also includes a variety of risk measures as well as the portfolio's drawdowns.
+````
+2022 May 31, 03:39 (π¦) /portfolio/po/ $ plot HRP_0 -ct SECTOR -hi -dd
+````
+
+
+
+Next to that, to delve deeper in the underlying conclusions the HRP method has drawn. Here, a closer look can be given
+to the assets cluster map, which links certain categories to each other. The linkage process is done per asset basis but
+here it is grouped per sector. Based on these results, the user can identify whether the optimization techniques also
+logically makes sense.
+````
+2022 May 31, 03:45 (π¦) /portfolio/po/ $ plot HRP_0 -ct SECTOR -rc -he
+````
+
+
diff --git a/website/content/terminal/stocks/comparison_analysis/_index.md b/website/content/terminal/stocks/comparison_analysis/_index.md
index 093e02e215d..97bd097654c 100755
--- a/website/content/terminal/stocks/comparison_analysis/_index.md
+++ b/website/content/terminal/stocks/comparison_analysis/_index.md
@@ -1,5 +1,105 @@
---
+title: Introduction to Comparison Analysis
+keywords: "Comparison, analysis, ca, menu, submenu, stocks, compare, correlation, similar, historical, hcorr, volume, income, balance, cashflow, sentiment, scorr, overview, valuation, financial, ownership, performance, technical, tsne, getpoly, getfunnhub, getfinviz, set, add, rmv, Polygon, Finnhub, Finviz, Yahoo, yFinance, FinBrain, market, watch "
+date: "2022-05-27"
+type: guides
+status: publish
+excerpt: "An Introduction to Comparison Analysis, within the Stocks Menu, with a brief overview of the features."
geekdocCollapseSection: true
---
+The Comparison Analysis menu provides the user with tools for:
+ - searching and populating a list of companies that are similar to the loaded ticker.
+ - building a correlation matrix.
+ - comparing the price and volume history of multiple companies.
+ - comparing financial statements, technical performance, and ownership statistics of otherwise similar companies.
+ - comparing sentiment of similar companies.
+ - building a list of companies to use features from the Portfolio Optimization menu.
-{{< toc-tree >}}
+To use all features in this menu, the following API keys (free) must be obtained by the user:
+
+ - Finnhub `getfinnhub`
+ - Polygon `getpoly`
+
+It is not necessary to load a ticker from the stocks menu to use these features. Enter the Comparison Analysis submenu by typing `ca` and pressing `ENTER` (β).
+
+
+
+## How to use
+
+To add a primary ticker, or to swap it for another, enter `ticker AMZN`. The three commands: `getfinnhub`, `getpoly`
+and `getfinviz` all provide a similar function. Sources may return different results.
+
+````
+(π¦) /stocks/ca/ $ getfinviz
+[Finviz] Similar Companies: WMT, BIG, BJ, COST, DG, DLTR, OLLI, PSMT, TGT, TUEM
+
+(π¦) /stocks/ca/ $ getpoly
+[Polygon] Similar Companies: WMT, AMZN, COST, EBAY, DLTR, KSS, JCP, TGT, M, DG
+
+(π¦) /stocks/ca/ $ getfinnhub
+[Finnhub] Similar Companies: WMT, COST, BJ, PSMT
+````
+Using any of these commands will automatically populate the list of similar companies for analysis. Furthermore, `add` & `rmv` allows the user to make modifications, or create a list from scratch.
+
+
+
+To show a correlation matrix, use the `hcorr` command. The start dates can be modified, which changes the results, to show correlation over different periods. For example, obtain a one year correlation matrix with `hcorr`:
+
+
+
+Or, by adjusting the date, it is possible to define a correlation matrix with a different time horizon, e.g `hcorr -s 2022-01-01`:
+
+
+
+The list of similar companies can be compared by a number of fundamental metrics.
+
+`valuation` displays earnings and valuation multiples.
+
+
+`performance` compares technical performance of similar companies:
+
+
+`sentiment` is a chart from Finbrain that shows sentiment over the last ten days.
+
+
+This list of similar companies can be imported directly to the Portfolio Optimization menu by using the command, `po`.
+
+
+## Examples
+
+The correlation matrix can also be used in other ways, like measuring sectors or asset classes. The chart below is a daily, price-normalized, comparison of S&P, NASDAQ, and BTC futures.
+
+````
+(π¦) /stocks/ca/ $ add es=f
+[Custom] Similar Companies: ES=F, NQ=F, BTC=F
+
+(π¦) /stocks/ca/ $ historical -n
+````
+
+
+This is a chart of the NASDAQ 100 Index, and three different futures contracts that are trading against it.
+
+````
+(π¦) /stocks/ca/ $ set ^NDX,NQH23.CME,NQZ22.CME,NQ=F
+[Custom] Similar Companies: ^NDX, NQH23.CME, NQZ22.CME, NQ=F
+
+(π¦) /stocks/ca/ $ historical
+````
+
+
+Compare financial statements of the ten largest US banks.
+````
+(π¦) /stocks/ca/ $ set C,USB,WFC,JPM,TD,GS,PNC,TFC,BAC,COF
+[Custom] Similar Companies: C, USB, WFC, JPM, TD, COF, PNC, TFC, BAC, GS
+(π¦) /stocks/ca/ $ cashflow
+````
+
+
+Compare the income statements.
+
+````
+(π¦) /stocks/ca/ $ income
+````
+
+
+To run a demonstration of the commands presented here, in the OpenBB Terminal, run this command from the home menu: `exe routines/comparison_demo.openbb`
diff --git a/website/content/terminal/stocks/dark_pool_shorts/_index.md b/website/content/terminal/stocks/dark_pool_shorts/_index.md
index 093e02e215d..130eeb3858d 100755
--- a/website/content/terminal/stocks/dark_pool_shorts/_index.md
+++ b/website/content/terminal/stocks/dark_pool_shorts/_index.md
@@ -1,5 +1,148 @@
---
+title: Introduction to Dark Pools & Short Data
+keywords: "darkpools, dps, dark, pools, dp, short, shorts, naked, selling, sales, SEC, disclosure, ATS, OTC, OTCE, NMS, borrowed, shorted, ftd, fails-to-deliver, volume"
+date: "05-30-2022"
+type: guides
+status: publish
+excerpt: "The Introduction to Dark Pools & Short Data, within the Stocks menu, which explains how to use the menu and
+provides a brief explanation of the features."
geekdocCollapseSection: true
---
+Dark Pools and short selling are both, controversial and mysterious, subjects. The lack of disclosure for short sales and dark pool trades makes a lot of guess-work. It is a good idea to read through some research on the topic available from the SEC:
+ - Alternative Trading Systems: Description of ATS Trading in National Market System Stocks
+ - Shedding Light on Dark Pools
+ - Staff Papers and Analyses
-{{< toc-tree >}}
+The purpose of this menu is to provide the user with tools for gauging the level of short interest, FTD rate, and off-exchange volume in a NMS security.
+There are also commands for looking at market as a whole. Enter the submenu from the Stocks menu by typing, `dps`, and hitting `ENTER` (β).
+
+
+
+To use every feature in the Dark Pools menu, an API key for Quandl must be obtained (for free) and authorized on the local installation. See the Getting Started Guide for help setting up the API keys in the OpenBB Terminal. The four commands at the bottom of the menu rely on a loaded ticker while the six above do not.
+
+## How to use
+
+The commands which are not ticker-specific provide screener-like utility. A list of the most-shorted stocks, according to Yahoo Finance, is displayed with the `shorted` command. It should be noted that this menu is only able to provide data for SEC-regulated equities.
+
+
+
+`hsi` is another source for the same list. There will be slight variations between the two.
+
+
+
+`prom` performs a linear regression to scan for tickers with growing trade activity on ATS tapes, reported to FINRA.
+
+````
+(π¦) /stocks/dps/ $ prom -n 50 -l 5 -t T1
+Processing Tier T1 ...
+Processing regression on 50 promising tickers ...
+````
+
+
+
+Tier 2 NMS Tickers:
+````
+(π¦) /stocks/dps/ $ prom -n 50 -l 5 -t T2
+Processing Tier T2 ...
+Processing regression on 50 promising tickers ...
+````
+
+
+
+Tier 3 OTCE Tickers:
+````
+(π¦) /stocks/dps/ $ prom -n 50 -l 5 -t OTCE
+Processing Tier OTCE ...
+Processing regression on 50 promising tickers ...
+````
+
+
+
+`pos` provides a summary for the last reported trading day (information is updated in the early evening). Position represents a rolling twenty-day total and directional trends can be identified by watching the changes over time. Adding the `-a` flag will sort the list from the bottom up - the most negative - and creates a fuller picture when watching in tandom with the positive side of the ledger. Monitor the rate of change in position sizes, or a reversal in directional flow. This white paper, written by SqueezeMetrics, sheds some light on the trading activity reported here.
+
+````
+(π¦) /stocks/dps/ $ pos -l 25
+````
+
+
+
+The other end of the spectrum:
+
+````
+(π¦) /stocks/dps/ $ pos -l 25 -a
+````
+
+
+
+Call on the help dialogue for every command by attaching, `-h` to the command. The optional arguments give the user flexibility to sort the columns, print the raw data, or export to a file.
+
+## Examples
+
+The cost-to-borrow is used as a proxy-measurement for an equity's specialness. `ctb` shows the most expensive equities to short, and the number shares available to short, on Interactive Brokers.
+
+````
+(π¦) /stocks/dps/ $ ctb
+````
+
+
+
+
+How many tickers have a borrow rate above 100%? Set the limit to a high number and export the data to a spreadsheet.
+
+````
+(π¦) /stocks/dps/ $ ctb -n 5000 --export xlsx
+
+Saved file: /exports/20220530_130058_stocks_dark_pool_shorts_cost_to_borrow.xlsx
+````
+
+As of writing, there are 158 securities with a cost-to-borrow rate above 100%.
+
+
+
+Cross reference that list with the `sidtc` command. Days-to-cover is the approximate number of days it would take to cover those shorts if the amount and proportion of volume were to remain constant. Use the optional arguments to sort the columns.
+
+
+
+Load AAPL and request a 1-year chart of the net short volume and position. This provides the individual ticker data corresponding with the `pos` command.
+
+````
+(π¦) /stocks/dps/ $ load AAPL
+
+Loading Daily AAPL stock with starting period 2019-05-28 for analysis.
+
+Datetime: 2022 May 30 14:59
+Timezone: America/New_York
+Currency: USD
+Market: CLOSED
+Company: Apple Inc.
+
+(π¦) /stocks/dps/ $ spos
+````
+
+
+
+Prolonged periods where the net short volume is above 50% are notable.
+
+````
+(π¦) /stocks/dps/ $ psi
+````
+
+
+
+See the aggregate sum total of fail-to-delivers, with the historical price, with the `ftd` command.
+
+````
+(π¦) /stocks/dps/ $ ftd -s 2020-05-30
+````
+
+
+
+The data from `dpotc`, statistics for individual NMS tickers, shows weekly OTC and ATS trade volume with the average lot size, which is reported on a lagging schedule.
+
+````
+(π¦) /stocks/dps/ $ dpotc
+````
+
+
+
+Run a live demo of these features by entering `exe routines/darkpool_demo.openbb` into the Terminal from the home screen.
diff --git a/website/content/terminal/stocks/discovery/_index.md b/website/content/terminal/stocks/discovery/_index.md
index 3205579ca50..9024b338db9 100755
--- a/website/content/terminal/stocks/discovery/_index.md
+++ b/website/content/terminal/stocks/discovery/_index.md
@@ -1,8 +1,50 @@
---
+title: Introduction to Stocks Discovery
+keywords: "stocks, discovery, disc, menu, submenu, pipo, fipo, gainers, losers, ugs, gtech, active, ulc, asc, ford, arkord, upcoming, trending, cnews, lowfloat, hotpenny, rtat, divcal, dividends, short, trending, news"
+date: "2022-05-30"
+type: guides
+status: publish
+excerpt: "Introducing the Discovery menu, within the Stocks menu. This guide will empower the user to get the most
+out of this set of features."
geekdocCollapseSection: true
---
+The set of features within the Stocks Discovery submenu provides tools for discovering trade setups, for following trends, and for staying up with current events. Enter the menu from the stocks menu by typing, `disc`, and pressing, `ENTER` (β). Absolute path jumping is possible from anywhere, to anywhere. For example, jumping from the Portfolio Optimization submenu to the Stocks Discovery submenu:
-Use the 'disc' command to navigate to the Discovery Submenu
-
+
-{{< toc-tree >}}
+To use all commands in the Discovery menu, the following (free) API keys are required:
+ - Quandl
+ - Finnhub
+
+See the Getting Started Guide for setting API keys in the OpenBB Terminal.
+
+## How to use
+
+The help dialogue, for any command, is displayed by attaching, `-h`, to the string; i.e., `divcal -h`. This menu will
+be one of the easiest to get comfortable with a command-line interface. All outputs from commands in this
+menu are text and tables. There are no charts or images generated. Exports, where available, can be formatted as
+csv, json, or xlsx files. Watch this short demonstration of all features in this menu:
+
+
+
+## Examples
+
+The dividend calendar can show any single date.
+
+````
+(π¦) /stocks/disc/ $ divcal -d 2022-06-02 -l 25
+````
+
+
+
+See Cathie Wood's trades and sort by different fields such as Fund, weighting, buy-only, or sell-only.
+
+
+
+Check the upcoming earnings schedule using, `upcoming`:
+
+
+
+Browse the news by category from Seeking Alpha with `cnews`:
+
+
diff --git a/website/content/terminal/stocks/discovery/discovery_demo.gif b/website/content/terminal/stocks/discovery/discovery_demo.gif
new file mode 100644
index 00000000000..41b02c9b264
Binary files /dev/null and b/website/content/terminal/stocks/discovery/discovery_demo.gif differ
diff --git a/website/data/menu/main.yml b/website/data/menu/main.yml
index fbb14490a0d..d890e536e7f 100755
--- a/website/data/menu/main.yml
+++ b/website/data/menu/main.yml
@@ -243,7 +243,8 @@ main:
ref: "/terminal/stocks/fundamental_analysis/cal"
- name: splits
ref: "/terminal/stocks/fundamental_analysis/splits"
- - name: fundamental_analysis/web"
+ - name: web
+ ref: "/terminal/stocks/fundamental_analysis/web"
- name: hq
ref: "/terminal/stocks/fundamental_analysis/hq"
- name: divs