diff --git a/src/components/Provider.tsx b/src/components/Provider.tsx
index d556df1..b805d67 100644
--- a/src/components/Provider.tsx
+++ b/src/components/Provider.tsx
@@ -46,8 +46,8 @@ export const ProviderSelector = ({setProvider}) => {
             message: 'Connect with the Java server IP and Java server port.'
         }),
         info: translate({
-            id: 'providers.provider.not_listed.description',
-            message: "If this does not work, ask your server hosting provider for a UDP port, and use that. For VPS/KVM servers please follow the self-hosting steps."
+            id: 'providers.provider.not_listed.info',
+            message: "If these instructions do not work, contact your server hosting provider and ask for a UDP port. Then, set clone-remote-port to false, and set 'bedrock port' to the port you got. For VPS/KVM servers, please follow the self-hosting steps."
         })
     } as HostingProvider);
     
diff --git a/src/data/providers.ts b/src/data/providers.ts
index 8019dd4..286ee44 100644
--- a/src/data/providers.ts
+++ b/src/data/providers.ts
@@ -62,7 +62,7 @@ const configChangeTemplates = {
         clone_remote_port: true,
         other_instructions: translate({
             id: 'providers.config.templates.custom_port_dedicated_ip',
-            message: "If you have a dedicated IP, you can contact the support to use a custom port."
+            message: "If you have a dedicated IP, you can contact the server hosting provider's support to use a custom port."
         })
     },
     javaAddress: {
diff --git a/wiki/geyser/setup.mdx b/wiki/geyser/setup.mdx
index 70f5682..2a5fe76 100644
--- a/wiki/geyser/setup.mdx
+++ b/wiki/geyser/setup.mdx
@@ -9,8 +9,8 @@ import TabItem from '@theme/TabItem'
 import Admonition from '@theme/Admonition';
 import Translate from "@docusaurus/Translate";
 
-import ModdedServers from '@site/wiki/geyser/setup/provider/modded-servers.mdx'
-import ProxyServers from '@site/wiki/geyser/setup/provider/proxy-servers.mdx'
+import ModdedServers from '@site/wiki/geyser/setup/provider/_modded-servers.mdx'
+import ProxyServers from '@site/wiki/geyser/setup/provider/_proxy-servers.mdx'
 import PaperSpigot from '@site/wiki/geyser/setup/provider/_paper-spigot.mdx'
 
 import ModdedServersSelf from '@site/wiki/geyser/setup/self/modded-servers.mdx'
@@ -43,10 +43,10 @@ export const SetupGuide = () => {
                                     <PaperSpigot provider={provider} />
                                 </TabItem>
                                 <TabItem value='modded-servers' label={<PlatformIcon img={ModIcon} text='Modded Servers' />}>
-                                    <ModdedServers />
+                                    <ModdedServers provider={provider}/>
                                 </TabItem>
                                 <TabItem value='proxy-servers' label={<PlatformIcon img={ProxyServersIcon} text='Proxy Servers' />}>
-                                    <ProxyServers />
+                                    <ProxyServers provider={provider}/>
                                 </TabItem>
                             </Tabs>
                         ) : (<Admonition type="warning" title={<Translate id='components.provider.no_support'>Not supported</Translate>}>{provider.warn}</Admonition>)}
diff --git a/wiki/geyser/setup/provider/_modded-servers.mdx b/wiki/geyser/setup/provider/_modded-servers.mdx
new file mode 100644
index 0000000..ea81ed2
--- /dev/null
+++ b/wiki/geyser/setup/provider/_modded-servers.mdx
@@ -0,0 +1,70 @@
+import Admonition from '@theme/Admonition';
+
+import { Versions } from '@site/src/components/Versions'
+
+:::caution
+Geyser-Fabric and Geyser-NeoForge run **only** on a <Versions platform="java"/> server.
+See [this page](/wiki/geyser/supported-versions#fabric-neoforge-servers) for more details.
+:::
+
+:::info
+Geyser only works with **server-side** mods. Mods that require a client-side install will not work!
+:::
+
+{props.provider.warn ? <Admonition type="warning" title='Warn'>{props.provider.warn}</Admonition> : null}
+
+<h3>Installing Geyser:</h3>
+{props.provider.custom_install_location ? props.provider.custom_install_location : (
+    <ol>
+        <li>Download the mod from [the download page](/download).</li>
+        <li>Place the Geyser mod jar in the `mods` folder. **For Fabric, you will also need the [FabricAPI](https://modrinth.com/mod/fabric-api) mod.**</li>
+        <li>Restart the server.</li>
+    </ol>
+)}
+<br />
+
+{props.provider.config ? (
+    <>
+        <h3>Geyser config changes:</h3>
+        Open your Geyser config. It is located in `/config/Geyser-Fabric/config.yml` (or
+        `/config/Geyser-NeoForge/config.yml`), and change the following:
+        <ul>
+            {props.provider.config.address ? <li>Change the `address` to `{props.provider.config.address}`</li> : null}
+            {props.provider.config.port ? <li>Change the `port` to `{props.provider.config.port}`</li> : null}
+            {props.provider.config.clone_remote_port ? <li>Change `clone-remote-port` to `true`</li> : null}
+            {props.provider.config.port_instruction ? <li>{props.provider.config.port_instruction}</li> : null}
+            {props.provider.config.address_instruction ? <li>{props.provider.config.address_instruction}</li> : null}
+            {props.provider.config.other_instructions ? <li>{props.provider.config.other_instructions}</li> : null}
+        </ul>
+    </>
+) : null}
+
+{props.provider.additional_step ? (
+    <>
+        <h3>Additional Steps:</h3>
+        {props.provider.additional_step}
+        <br />
+    </>
+) : null}
+
+
+{props.provider.connect_instructions ? (
+    <>
+        <h3>Connecting on Bedrock:</h3>
+        {props.provider.connect_instructions}
+    </>
+) : null}
+
+
+{props.provider.info ? <Admonition type="info" title='Info'>{props.provider.info}</Admonition> : null}
+
+
+{props.provider.hosting_article || props.provider.hosting_support ? (
+    <>
+        <h4>More Information:</h4>
+        <ul>
+            {props.provider.hosting_article ? (<li><a href={props.provider.hosting_article} target='_blank'>Hosting provider article</a></li>) : null}
+            {props.provider.hosting_support ? (<li><a href={props.provider.hosting_support} target='_blank'>Hosting provider support</a></li>) : null}
+        </ul>
+    </>
+) : null}
\ No newline at end of file
diff --git a/wiki/geyser/setup/provider/_paper-spigot.mdx b/wiki/geyser/setup/provider/_paper-spigot.mdx
index 5c75ca4..3bb3a42 100644
--- a/wiki/geyser/setup/provider/_paper-spigot.mdx
+++ b/wiki/geyser/setup/provider/_paper-spigot.mdx
@@ -9,24 +9,24 @@ See also [this page](/wiki/geyser/supported-versions/) on supported versions.
 
 {props.provider.warn ? <Admonition type="warning" title='Warn'>{props.provider.warn}</Admonition> : null}
 
-
-<h3>Install:</h3>
+<h3>Installing Geyser:</h3>
 {props.provider.custom_install_location ? props.provider.custom_install_location : (
     <ol>
         <li>Download the plugin from [the download page](/download).</li>
-        <li>Place the Geyser-Spigot.jar in the `plugins` folder, and restart the server.</li>
+        <li>Place the Geyser-Spigot.jar in the `plugins` folder.</li>
+        <li>Restart the server.</li>
     </ol>
 )}
 <br />
 
 {props.provider.config ? (
     <>
-        <h3>Make the following config changes:</h3>
-        Open your Geyser config, located in `/plugins/Geyser-Spigot/config.yml`
+        <h3>Geyser config changes:</h3>
+        Open your Geyser config. It is located in `/plugins/Geyser-Spigot/config.yml`.
         <ul>
             {props.provider.config.address ? <li>Change the `address` to `{props.provider.config.address}`</li> : null}
             {props.provider.config.port ? <li>Change the `port` to `{props.provider.config.port}`</li> : null}
-            {props.provider.config.clone_remote_port ? <li>Change `clone-remote-port` to `{props.provider.config.clone_remote_port}`</li> : null}
+            {props.provider.config.clone_remote_port ? <li>Change `clone-remote-port` to `true`</li> : null}
             {props.provider.config.port_instruction ? <li>{props.provider.config.port_instruction}</li> : null}
             {props.provider.config.address_instruction ? <li>{props.provider.config.address_instruction}</li> : null}
             {props.provider.config.other_instructions ? <li>{props.provider.config.other_instructions}</li> : null}
@@ -44,13 +44,12 @@ See also [this page](/wiki/geyser/supported-versions/) on supported versions.
 
 
 {props.provider.connect_instructions ? (
-    <b>
+    <>
+        <h3>Connecting on Bedrock:</h3>
         {props.provider.connect_instructions}
-        <br />
-        <br />
-    </b>
-) : (<div>Nope</div>)}
-
+    </>
+) : null}
+<br />
 
 {props.provider.info ? <Admonition type="info" title='Info'>{props.provider.info}</Admonition> : null}
 
diff --git a/wiki/geyser/setup/provider/_proxy-servers.mdx b/wiki/geyser/setup/provider/_proxy-servers.mdx
new file mode 100644
index 0000000..8377cd1
--- /dev/null
+++ b/wiki/geyser/setup/provider/_proxy-servers.mdx
@@ -0,0 +1,68 @@
+import Admonition from '@theme/Admonition';
+
+import { Versions } from '@site/src/components/Versions'
+
+:::info
+- Install Geyser **only** on the proxy server! You can install Floodgate on all servers for better skin support &
+network-wide Floodgate API availability for other plugins.
+- All servers on the network must accept <Versions platform="java"/> Java clients, as Geyser imitates one.
+:::
+
+{props.provider.warn ? <Admonition type="warning" title='Warn'>{props.provider.warn}</Admonition> : null}
+
+<h3>Installing Geyser:</h3>
+{props.provider.custom_install_location ? props.provider.custom_install_location : (
+    <ol>
+        <li>Download the plugin for your proxy software from [the download page](/download).</li>
+        <li>Place the Geyser plugin jar in the `plugins` folder.</li>
+        <li>Restart the proxy.</li>
+    </ol>
+)}
+<br />
+
+{props.provider.config ? (
+    <>
+        <h3>Geyser config changes:</h3>
+        Open your Geyser config. It is located in `/config/Geyser-Velocity/config.yml` (or
+        `/config/Geyser-BungeeCord/config.yml`), and change the following:
+        <ol>
+            {props.provider.config.address ? <li>Change the `address` to `{props.provider.config.address}`</li> : null}
+            {props.provider.config.port ? <li>Change the `port` to `{props.provider.config.port}`</li> : null}
+            {props.provider.config.clone_remote_port ? <li>Change `clone-remote-port` to `true`</li> : null}
+            {props.provider.config.port_instruction ? <li>{props.provider.config.port_instruction}</li> : null}
+            {props.provider.config.address_instruction ? <li>{props.provider.config.address_instruction}</li> : null}
+            {props.provider.config.other_instructions ? <li>{props.provider.config.other_instructions}</li> : null}
+        </ol>
+    </>
+) : null}
+
+
+{props.provider.additional_step ? (
+    <>
+        <h3>Additional Steps:</h3>
+        {props.provider.additional_step}
+        <br />
+    </>
+) : null}
+
+
+{props.provider.connect_instructions ? (
+    <>
+        <h3>Connecting on Bedrock:</h3>
+        {props.provider.connect_instructions}
+    </>
+) : null}
+
+
+{props.provider.info ? <Admonition type="info" title='Info'>{props.provider.info}</Admonition> : null}
+
+
+{props.provider.hosting_article || props.provider.hosting_support ? (
+    <>
+        <h4>More Information:</h4>
+        <ul>
+            {props.provider.hosting_article ? (<li><a href={props.provider.hosting_article} target='_blank'>Hosting provider article</a></li>) : null}
+            {props.provider.hosting_support ? (<li><a href={props.provider.hosting_support} target='_blank'>Hosting provider support</a></li>) : null}
+        </ul>
+    </>
+) : null}
\ No newline at end of file
diff --git a/wiki/geyser/setup/provider/modded-servers.mdx b/wiki/geyser/setup/provider/modded-servers.mdx
deleted file mode 100644
index 4b31801..0000000
--- a/wiki/geyser/setup/provider/modded-servers.mdx
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: Geyser Hosting Provider Modded Setup
-description: Learn how to set up Geyser on your Fabric or NeoForge server from a hosting provider.
----
-
-import { Versions } from '@site/src/components/Versions'
-
-:::caution
-Geyser-Fabric and Geyser-NeoForge run **only** on a <Versions platform="java"/> server.
-See [this page](/wiki/geyser/supported-versions#fabric-neoforge-servers) for more details.
-:::
-
-:::info
-Geyser only works with **server-side** mods. Mods that require a client-side install will not work!
-:::
-
-1. Select your server hosting provider in the dropdown above.
-2. Download the mod from [the download page](/download).
-3. Place the Geyser mod jar in the `mods` folder, and restart the server. **For Fabric, you will also need [FabricAPI](https://modrinth.com/mod/fabric-api).**
-4. Open your Geyser config, located in `/config/Geyser-Fabric/config.yml` (or `/config/Geyser-NeoForge/config.yml`), and find the following:
-
-    ```yaml
-    bedrock: 
-        # The IP address that will listen for connections. 
-        # Generally, you should only uncomment and change this if you want to limit what IPs can connect to your server. 
-        #address: 0.0.0.0 
-
-        # The port that will listen for connections. This is the port that Bedrock players will use to connect to your server.
-        port: 19132 
-
-        # Some hosting services change your Java port everytime you start the server and require the same port to be used for Bedrock. 
-        # This option makes the Bedrock port the same as the Java port every time you start the server. 
-        # This option is for the plugin version only. 
-        clone-remote-port: false 
-    ``` 
-    The vital part is the port. This is the port that Bedrock players will use to connect to your server. 
-    Follow the instructions in the provider selector - change the port, and if necessary, `clone-remote-port` & `address`.
-    If `clone-remote-port` is enabled, the bedrock port will be overwritten with the Java port!
-    **Important**: Other services/mods that rely on ports with UDP, such as Voice Chats or Query, cannot share the port with Geyser.
-
-5. Verify whether connections are possible by running `geyser connectiontest <ip> <port>` in the console.
-
-:::info
-To allow Bedrock Edition players to join your server without needing to log in to a paid Java Edition account, you can use <a href="/wiki/floodgate/setup/">Floodgate</a>.
-:::
\ No newline at end of file
diff --git a/wiki/geyser/setup/provider/proxy-servers.mdx b/wiki/geyser/setup/provider/proxy-servers.mdx
deleted file mode 100644
index a248c66..0000000
--- a/wiki/geyser/setup/provider/proxy-servers.mdx
+++ /dev/null
@@ -1,43 +0,0 @@
----
-title: Geyser Hosting Provider Proxy Servers Setup
-description: Learn how to set up Geyser on your Bungee, Waterfall, or Velocity server from a hosting provider.
-hide_title: true
----
-
-import { Versions } from '@site/src/components/Versions'
-
-:::info
-- Install Geyser **only** on the proxy server! You can install Floodgate on all servers for better skin support & 
-    network-wide Floodgate API availability for other plugins.
-- All servers on the network must accept <Versions platform="java"/> Java clients, as Geyser imitates one.  
-:::
-
-1. Select your server hosting provider in the dropdown above.
-2. Download the plugin for your proxy software from [the download page](/download).
-3. Place the Geyser jar in the `plugins` folder, and restart the server.
-4. Open your Geyser config, located in `/plugins/Geyser-xyz/config.yml`, and find the following:
-
-    ```yaml
-    bedrock: 
-        # The IP address that will listen for connections. 
-        # Generally, you should only uncomment and change this if you want to limit what IPs can connect to your server. 
-        #address: 0.0.0.0
-
-        # The port that will listen for connections. This is the port that Bedrock players will use to connect to your server.
-        port: 19132
-
-        # Some hosting services change your Java port everytime you start the server and require the same port to be used for Bedrock. 
-        # This option makes the Bedrock port the same as the Java port every time you start the server. 
-        # This option is for the plugin version only. 
-        clone-remote-port: false
-    ``` 
-    The vital part is the port. This is the port that Bedrock players will use to connect to your server. 
-    Follow the instructions in the provider selector - change the port, and if necessary, `clone-remote-port` & `address`.
-    If `clone-remote-port` is enabled, the bedrock port will be overwritten with the Java port!   
-    **Important**: Other services/plugins that rely on ports with UDP, such as Voice Chats or Query, cannot share the port with Geyser.
-
-5. Verify whether connections are possible by running `geyser connectiontest <ip> <port>` in the console.
-
-:::info
-To allow Bedrock Edition players to join your server without needing to log in to a paid Java Edition account, you can use <a href="/wiki/floodgate/setup/">Floodgate</a>.
-:::
\ No newline at end of file