diff --git a/modules/applications/emacs.nix b/modules/applications/emacs.nix
index 5e89eb9..8be9bfa 100644
--- a/modules/applications/emacs.nix
+++ b/modules/applications/emacs.nix
@@ -2,11 +2,11 @@
 # TODO Still need the following dependecies
 #  - Language tools (grammer)
 let
-  cfg = config.application.emacs;
+  cfg = config.this.application.emacs;
   graphical = config.this.graphical;
 in with lib; {
   options = {
-    application.emacs = {
+    this.application.emacs = {
       enable = mkOption {
         default = graphical.enable;
         type = with types; bool;
diff --git a/modules/applications/firefox.nix b/modules/applications/firefox.nix
index cfaf88c..db30176 100644
--- a/modules/applications/firefox.nix
+++ b/modules/applications/firefox.nix
@@ -1,11 +1,11 @@
 { config, pkgs, lib, ... }:
 let
-  cfg = config.application.firefox;
+  cfg = config.this.application.firefox;
   graphical = config.this.graphical;
-  sway_cfg = config.applications.sway;
+  sway_cfg = config.this.application.sway;
 in with lib; {
   options = {
-    application.firefox = {
+    this.application.firefox = {
       enable = mkOption {
         default = graphical.enable;
         type = with types; bool;
diff --git a/modules/applications/nextcloud.nix b/modules/applications/nextcloud.nix
index 5cd7747..99bf1d5 100644
--- a/modules/applications/nextcloud.nix
+++ b/modules/applications/nextcloud.nix
@@ -1,10 +1,10 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.application.nextcloud;
+  cfg = config.this.application.nextcloud;
   graphical = config.this.graphical;
 in with lib; {
   options = {
-    application.nextcloud = {
+    this.application.nextcloud = {
       enable = mkOption {
         default = graphical.enable;
         type = with types; bool;
diff --git a/modules/applications/sway/mako.nix b/modules/applications/sway/mako.nix
index cce1f02..54b0896 100644
--- a/modules/applications/sway/mako.nix
+++ b/modules/applications/sway/mako.nix
@@ -1,12 +1,11 @@
 { options, config, lib, pkgs, ... }:
 let
-  cfg = config.application.mako;
-  sway = config.application.sway;
+  cfg = config.this.application.mako;
+  sway = config.this.application.sway;
 in with lib; {
   options = {
-    application.mako = {
+    this.application.mako = {
       enable = mkOption {
-        # TODO track based on sway default
         default = sway.enable;
         type = with types; bool;
         description = "testing one two three";
diff --git a/modules/applications/sway/sway.nix b/modules/applications/sway/sway.nix
index 0723785..19f423b 100644
--- a/modules/applications/sway/sway.nix
+++ b/modules/applications/sway/sway.nix
@@ -1,10 +1,10 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.application.sway;
+  cfg = config.this.application.sway;
   graphical = config.this.graphical;
 in with lib; {
   options = {
-    application.sway = {
+    this.application.sway = {
       enable = mkOption {
         # TODO base on graphical
         default = graphical.enable;
diff --git a/modules/applications/sway/waybar.nix b/modules/applications/sway/waybar.nix
index e3e0dd4..c3a83d3 100644
--- a/modules/applications/sway/waybar.nix
+++ b/modules/applications/sway/waybar.nix
@@ -1,12 +1,11 @@
 { options, config, lib, pkgs, ... }:
 let
-  cfg = config.application.waybar;
-  sway_cfg = config.application.sway;
+  cfg = config.this.application.waybar;
+  sway_cfg = config.this.application.sway;
 in with lib; {
   options = {
-    application.waybar = {
+    this.application.waybar = {
       enable = mkOption {
-        # TODO track based on sway default
         default = sway_cfg.enable;
         type = with types; bool;
         description = "testing one two three";