diff --git a/elements/components/initial-setup.yml b/elements/components/initial-setup.yml
index d16face06..982fb5280 100644
--- a/elements/components/initial-setup.yml
+++ b/elements/components/initial-setup.yml
@@ -1,5 +1,5 @@
 id: initial-setup
-version: 2.0.2
+version: 2.0.3
 about: System Initial Setup
 merge: [ ostree-branch.yml, elements/include/rlxos.inc ]
 
diff --git a/elements/components/welcome-tour.yml b/elements/components/welcome-tour.yml
index 71f34a8dd..943058ad7 100644
--- a/elements/components/welcome-tour.yml
+++ b/elements/components/welcome-tour.yml
@@ -1,7 +1,19 @@
 id: welcome-tour
-version: 0.1.2
+version: 2.0
 about: RLXOS welcome tour
 merge: [elements/include/rlxos.inc]
 
+post-script: |-
+  install -v -D -m 0755 /dev/stdin %{install-root}/%{sysconfdir}/xdg/autostart/welcome-tour.desktop << "EOF"
+  [Desktop Entry]
+  Name=Welcome Tour
+  Comment=RLXOS Welcome tour
+  Icon=welcome-tour
+  Exec=env WELCOME_TOUR_AUTOSTART=1 %{bindir}/welcome-tour
+  Terminal=false
+  Type=Application
+  EOF
+
+
 depends:
   - components/gtkmm.yml
diff --git a/elements/extensions/x11.yml b/elements/extensions/x11.yml
deleted file mode 100644
index daae45ef2..000000000
--- a/elements/extensions/x11.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-id: x11
-version: 11
-about: x11 libraries and tools
-include:
-  - components/meta-x11.yml
-
-merge: [elements/include/extension.inc]
\ No newline at end of file
diff --git a/elements/platform.yml b/elements/platform.yml
index 54bb69a44..b2ba91cf3 100644
--- a/elements/platform.yml
+++ b/elements/platform.yml
@@ -106,6 +106,7 @@ depends:
   - components/file-roller.yml
 
   - components/meta-xfce4.yml
+  - components/meta-x11.yml
   - components/lightdm.yml
   - components/initial-setup.yml
   - components/epdfview.yml
diff --git a/src/initial-setup b/src/initial-setup
index a2f1d95ef..c5a88307e 160000
--- a/src/initial-setup
+++ b/src/initial-setup
@@ -1 +1 @@
-Subproject commit a2f1d95ef16e5ac1e8bf0d396efd96f3b6fb56b5
+Subproject commit c5a88307e192d27b9d22a0f492214383cff76abd
diff --git a/src/welcome-tour/Window.ui b/src/welcome-tour/Window.ui
index d4514673a..6adf04b4d 100644
--- a/src/welcome-tour/Window.ui
+++ b/src/welcome-tour/Window.ui
@@ -98,7 +98,7 @@ operating system and new features of this release</property>
                     <property name="receives-default">True</property>
                     <property name="relief">none</property>
                     <property name="use-stock">True</property>
-                    <property name="uri">https://rlxos.dev/community</property>
+                    <property name="uri">https://github.com/itsManjeet/rlxos/discussions</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -199,7 +199,7 @@ operating system and new features of this release</property>
                 <property name="receives-default">True</property>
                 <property name="halign">center</property>
                 <property name="relief">none</property>
-                <property name="uri">https://rlxos.dev/apps</property>
+                <property name="uri">https://apps.rlxos.dev</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -277,7 +277,7 @@ operating system and new features of this release</property>
                 <property name="receives-default">True</property>
                 <property name="halign">center</property>
                 <property name="relief">none</property>
-                <property name="uri">https://docs.rlxos.dev/getting-started/welcome-tour/</property>
+                <property name="uri">https://docs.rlxos.dev</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -436,7 +436,7 @@ operating system and new features of this release</property>
                 <property name="receives-default">True</property>
                 <property name="halign">center</property>
                 <property name="relief">none</property>
-                <property name="uri">https://docs.rlxos.dev/system-management/extensions/</property>
+                <property name="uri">https://docs.rlxos.dev</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -516,7 +516,7 @@ operating system and new features of this release</property>
                 <property name="receives-default">True</property>
                 <property name="halign">center</property>
                 <property name="relief">none</property>
-                <property name="uri">https://rlxos.dev/community</property>
+                <property name="uri">https://github.com/itsManjeet/rlxos/discussions</property>
               </object>
               <packing>
                 <property name="expand">False</property>