diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 76591932..de9a9e3b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ __Please Note:__ GitHub is for bug reports and contributions only - if you have
 At this point you're waiting on us to merge your pull request. We'll review all pull requests, and make suggestions and changes if necessary.
 
 # Additional Resources
-* [UsersWP Developer's Codex](https://userswp.io/docs/)
+* [UsersWP Developer's Codex](https://userswp.io/documentation/)
 * [General GitHub Documentation](https://help.github.com/)
 * [GitHub Pull Request documentation](https://help.github.com/send-pull-requests/)
 * [PHPUnit Tests Guide](https://phpunit.de/manual/current/en/writing-tests-for-phpunit.html)
\ No newline at end of file
diff --git a/admin/class-admin-setup-wizard.php b/admin/class-admin-setup-wizard.php
index f04d10b7..51f1f59a 100755
--- a/admin/class-admin-setup-wizard.php
+++ b/admin/class-admin-setup-wizard.php
@@ -715,7 +715,7 @@ public function setup_ready() {
             <h2><?php esc_html_e( 'Learn more', 'userswp' ); ?></h2>
             <ul>
                 <li class="uwp-getting-started">
-                    <a href="https://userswp.io/docs/?utm_source=setupwizard&utm_medium=product&utm_content=getting-started&utm_campaign=userswpplugin"
+                    <a href="https://userswp.io/documentation/?utm_source=setupwizard&utm_medium=product&utm_content=getting-started&utm_campaign=userswpplugin"
                        target="_blank"><?php esc_html_e( 'Getting started guide', 'userswp' ); ?></a>
                 </li>
                 <li class="uwp-newsletter">
diff --git a/admin/class-admin.php b/admin/class-admin.php
index 4412fa7a..631f6a72 100644
--- a/admin/class-admin.php
+++ b/admin/class-admin.php
@@ -73,7 +73,7 @@ public function __construct() {
 					'slug'              => 'userswp',
 					'version'           => USERSWP_VERSION,
 					'support_url'       => 'https://userswp.io/support/',
-					'documentation_url' => 'https://docs.userswp.io/',
+					'documentation_url' => 'https://userswp.io/documentation/',
 					'activated'         => get_option( 'uwp_installed_on', 0 ),
                 )
             );
@@ -851,7 +851,7 @@ public function process_user_actions() {
 	public static function plugin_row_meta( $links, $file ) {
 		if ( USERSWP_PLUGIN_BASENAME == $file ) {
 			$row_meta = array(
-				'docs'        => '<a href="' . esc_url( 'https://docs.userswp.io/' ) . '" aria-label="' . esc_attr__( 'View UsersWP Documentation', 'userswp' ) . '">' . esc_html__( 'Docs', 'userswp' ) . '</a>',
+				'docs'        => '<a href="' . esc_url( 'https://userswp.io/documentation/' ) . '" aria-label="' . esc_attr__( 'View UsersWP Documentation', 'userswp' ) . '">' . esc_html__( 'Docs', 'userswp' ) . '</a>',
 				'support'     => '<a href="' . esc_url( 'https://userswp.io/support/' ) . '" aria-label="' . esc_attr__( 'Visit UsersWP support', 'userswp' ) . '">' . esc_html__( 'Support', 'userswp' ) . '</a>',
 				'translation' => '<a href="' . esc_url( 'https://userswp.io/translate/projects' ) . '" aria-label="' . esc_attr__( 'View translations', 'userswp' ) . '">' . esc_html__( 'Translations', 'userswp' ) . '</a>',
 			);
diff --git a/admin/class-uwp-admin-help.php b/admin/class-uwp-admin-help.php
index cb3bd8ec..9ee2075d 100644
--- a/admin/class-uwp-admin-help.php
+++ b/admin/class-uwp-admin-help.php
@@ -62,7 +62,7 @@ public function add_tabs() {
         public function get_support_tab_content() {
 
             $support_html = "<h2>".__('Help & Support','userswp')."</h2>";
-            $support_html .= "<p>".sprintf(__('Should you need help understanding, using, or extending UsersWP <a href="%1$s">please read our documentation</a>. You will find all kinds of resources including snippets, tutorials and much more.,','userswp'),'https://userswp.io/docs/?utm_source=setupwizard&utm_medium=product&utm_content=getting-started&utm_campaign=userswpplugin')."</p>";
+            $support_html .= "<p>".sprintf(__('Should you need help understanding, using, or extending UsersWP <a href="%1$s">please read our documentation</a>. You will find all kinds of resources including snippets, tutorials and much more.,','userswp'),'https://userswp.io/documentation/?utm_source=setupwizard&utm_medium=product&utm_content=getting-started&utm_campaign=userswpplugin')."</p>";
             $support_html .= "<p>".sprintf(__('For further assistance with UsersWP core or with premium extensions sold by UsersWP you can use our <a href="%1$s">support forums</a>.','userswp'),'https://userswp.io/support/?utm_source=setupwizard&utm_medium=product&utm_content=docs&utm_campaign=userswpplugin')."</p>";
             $support_html .= "<p>".__('Before asking for help we recommend checking the system status page to identify any problems with your configuration.','userswp')."</p>";
             $support_html .= "<p><a class='button button-primary' href='".admin_url( 'admin.php?page=uwp_status' )."'>".__( 'System status', 'userswp' )."</a> <a class='button' href='https://userswp.io/support/?utm_source=setupwizard&utm_medium=product&utm_content=docs&utm_campaign=userswpplugin'>".__( 'UsersWP support', 'userswp' )."</a></p>";