diff --git a/flake.lock b/flake.lock
index 243cc2b..0bce6f1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1627571355,
-        "narHash": "sha256-iB+s0R/d/bBISo9+JtyytNtS2YMP5oLFqcyfqhXO1qU=",
+        "lastModified": 1630693543,
+        "narHash": "sha256-7Sly3ReaJZw60Qo0rpfN4jF6zy94nwQz6ENgUUFzJfg=",
         "owner": "lovesegfault",
         "repo": "beautysh",
-        "rev": "1ad178d756f1f7e77d5215b768bc5c9d4ff8e4fa",
+        "rev": "5609593961b70428f58d5c1b4b25cdda43b0d0bd",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1630939671,
-        "narHash": "sha256-ugNOm7DUHk9kxtD+FNZcRdzyiZKm/wpA0SYeBTg+DO4=",
+        "lastModified": 1633877936,
+        "narHash": "sha256-+o3n6s7fR8dBGRldTGelyp2j3jSyTlrniOXwNfmMG20=",
         "owner": "divnix",
         "repo": "bud",
-        "rev": "26ba27616647dcd08dac2ee818721bc748c4ac61",
+        "rev": "15df091133ff95216c321b09be04905c0a0944c4",
         "type": "github"
       },
       "original": {
@@ -63,22 +63,6 @@
         "type": "github"
       }
     },
-    "cachix": {
-      "locked": {
-        "lastModified": 1632291606,
-        "narHash": "sha256-oEN24XJYAFK9tsD13TzLEizpgQigEfgC6i9x1b/1pVU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "83413f47809790e4ca012e314e7782adeae36cf2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-21.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -392,33 +376,21 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1631962327,
-        "narHash": "sha256-h2fgtNHozEcB42BQ1QVWAJUpQ1FA3gpgq/RrOKAxbfE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "bc9b956714ed6eac5f8888322aac5bc41389defa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-wayland": {
       "inputs": {
-        "cachix": "cachix",
-        "nixpkgs": "nixpkgs"
+        "cachix": [
+          "unstable"
+        ],
+        "nixpkgs": [
+          "unstable"
+        ]
       },
       "locked": {
-        "lastModified": 1632342403,
-        "narHash": "sha256-LGHyTaXX7kO9V0zLLecBQLlZz8wPE4/DcpHGuRgs5aM=",
+        "lastModified": 1634158823,
+        "narHash": "sha256-l+LXVfmCH+Xk7nzghlEIAkrSta93ANax2MgRgbh6aZg=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "e30e03810b615aaf3beeb590fdad6009c16ccf2a",
+        "rev": "80a3b4fb3c2ffd318c653ebaff2253dded674965",
         "type": "github"
       },
       "original": {
@@ -556,11 +528,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1632342741,
-        "narHash": "sha256-8q12+qSkpVy+up1oGF2PeafBRLSslrUESRTdjn5y8u0=",
+        "lastModified": 1634115022,
+        "narHash": "sha256-K9DZMQ47VRrg9gtTPwex5p0E8LnwM/dDkNe7AQW0qj0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5c8efd0034e2f7565ff81a8897ca9dd761889265",
+        "rev": "564cb4d81d4f734dd068684adec5a60077397fe9",
         "type": "github"
       },
       "original": {
@@ -572,11 +544,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1631962327,
-        "narHash": "sha256-h2fgtNHozEcB42BQ1QVWAJUpQ1FA3gpgq/RrOKAxbfE=",
+        "lastModified": 1633971123,
+        "narHash": "sha256-WmI4NbH1IPGFWVkuBkKoYgOnxgwSfWDgdZplJlQ93vA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bc9b956714ed6eac5f8888322aac5bc41389defa",
+        "rev": "e4ef597edfd8a0ba5f12362932fc9b1dd01a0aef",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5a2d3e9..2c86fdf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,8 +41,8 @@
       pinebook-pro-kernel-latest.url = github:nixos/nixpkgs/755db9a1e9a35c185f7d6c0463025e94ef44622e;
 
       nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
-      # nixpkgs-wayland.inputs.nixpkgs.follows = "unstable";
-      # nixpkgs-wayland.inputs.cachix.follows = "stable";
+      nixpkgs-wayland.inputs.nixpkgs.follows = "unstable";
+      nixpkgs-wayland.inputs.cachix.follows = "unstable";
     };
 
   outputs =
diff --git a/pkgs/emacs/default.nix b/pkgs/emacs/default.nix
index 6699e2a..37b53bb 100644
--- a/pkgs/emacs/default.nix
+++ b/pkgs/emacs/default.nix
@@ -5,7 +5,7 @@ let
 in
 emacsWithPackages (
   epkgs: (
-    with epkgs.melpaStablePackages; []
+    with epkgs.melpaStablePackages; [ ]
   ) ++ (
     with epkgs.melpaPackages; [
       all-the-icons
@@ -18,8 +18,10 @@ emacsWithPackages (
       magit
       company
       helm-company
+      helm-ag
       fira-code-mode
       org-superstar
+      org-roam
       nix-mode
       lsp-python-ms
       lispy
@@ -39,5 +41,9 @@ emacsWithPackages (
     with epkgs.elpaPackages; [
       modus-themes
     ]
-  ) ++ []
+  ) ++ (
+    with pkgs; [
+      pkgs.graphviz-nox
+    ]
+  )
 )
diff --git a/profiles/dbus/default.nix b/profiles/dbus/default.nix
index 09e08d2..605602d 100644
--- a/profiles/dbus/default.nix
+++ b/profiles/dbus/default.nix
@@ -1,4 +1,5 @@
 { pkgs, ... }:
 {
   services.dbus.packages = with pkgs; [ gnome3.dconf ];
+  programs.dconf.enable = true;
 }
diff --git a/profiles/xdg/default.nix b/profiles/xdg/default.nix
index 4a8f40b..908ffba 100644
--- a/profiles/xdg/default.nix
+++ b/profiles/xdg/default.nix
@@ -8,5 +8,6 @@
     MOZ_ENABLE_WAYLAND = "1";
     XDG_CURRENT_DESKTOP = "sway"; # https://github.com/emersion/xdg-desktop-portal-wlr/issues/20
     XDG_SESSION_TYPE = "wayland"; # https://github.com/emersion/xdg-desktop-portal-wlr/pull/11
+
   };
 }
diff --git a/users/ccr/default.nix b/users/ccr/default.nix
index 162c967..d2b3e85 100644
--- a/users/ccr/default.nix
+++ b/users/ccr/default.nix
@@ -3,12 +3,15 @@
   home-manager.users.ccr = { suites, ... }: {
     imports = with suites; shell ++ gui ++ browser ++ multimedia ++ dev ++ base;
     home.packages = with pkgs; [
-      nixpkgs-fmt
-      rnix-lsp
       ack
       ranger
       calibre
       element-desktop
+      gtk-engine-murrine
+      gtk_engines
+      gsettings-desktop-schemas
+      lxappearance
+      yarn
     ];
   };
 
diff --git a/users/profiles/emacs/default.nix b/users/profiles/emacs/default.nix
index ca892e7..83a26a4 100644
--- a/users/profiles/emacs/default.nix
+++ b/users/profiles/emacs/default.nix
@@ -12,9 +12,29 @@
   };
 
   home.packages = with pkgs; [
+<<<<<<< HEAD
+=======
+    python-language-server
+    python
+>>>>>>> 651ab71 (Emacs and inputs updated)
     fd
     ag
     nixpkgs-fmt
     rnix-lsp
+<<<<<<< HEAD
   ] ++ (if config.network.hostname != "mbp" then python-language-server else [ ]);
+=======
+    (
+      makeDesktopItem {
+        name = "org-protocol";
+        exec = "emacs %u";
+        #exec = "emacsclient %u";
+        comment = "Org protocol";
+        desktopName = "org-protocol";
+        type = "Application";
+        mimeType = "x-scheme-handler/org-protocol";
+      }
+    )
+  ];
+>>>>>>> 651ab71 (Emacs and inputs updated)
 }
diff --git a/users/profiles/emacs/emacs.d/config/aesthetics.el b/users/profiles/emacs/emacs.d/config/aesthetics.el
index 3cdd1cd..30e2e63 100644
--- a/users/profiles/emacs/emacs.d/config/aesthetics.el
+++ b/users/profiles/emacs/emacs.d/config/aesthetics.el
@@ -9,8 +9,10 @@
 )  
 
 (use-package fira-code-mode
-  :custom (fira-code-mode-disabled-ligatures '(":")) ;; List of ligatures to turn off
-  :config (global-fira-code-mode))
+  :custom (fira-code-mode-disabled-ligatures '()) ;; List of ligatures to turn off
+  :config
+  (fira-code-mode-set-font)
+  (global-fira-code-mode))
 
 
 (defalias 'yes-or-no-p 'y-or-n-p)
diff --git a/users/profiles/emacs/emacs.d/config/config-org.el b/users/profiles/emacs/emacs.d/config/config-org.el
index f595fcf..f1cc033 100644
--- a/users/profiles/emacs/emacs.d/config/config-org.el
+++ b/users/profiles/emacs/emacs.d/config/config-org.el
@@ -1,10 +1,28 @@
 (use-package org
   :init
-  (setq fill-column 80)
+    (setq fill-column 80)
+    (require 'org-protocol)
   :hook 
   ((org-mode . refill-mode)
    (org-mode . (lambda () (org-superstar-mode 1)))
    (org-mode . prettify-symbols-mode)))
 
+(use-package org-roam
+  :init
+  (setq org-roam-v2-ack t)
+  :custom
+  (org-roam-directory (file-truename "~/roam/"))
+  (org-roam-graph-executable "dot")
+  :bind (("C-c n l" . org-roam-buffer-toggle)
+         ("C-c n f" . org-roam-node-find)
+         ("C-c n g" . org-roam-graph)
+         ("C-c n i" . org-roam-node-insert)
+         ("C-c n c" . org-roam-capture)
+         ;; Dailies
+         ("C-c n j" . org-roam-dailies-capture-today))
+  :config
+  (org-roam-db-autosync-mode)
+  ;; If using org-roam-protocol
+  (require 'org-roam-protocol))
 
 (provide 'config-org)
diff --git a/users/profiles/emacs/emacs.d/config/config-python.el b/users/profiles/emacs/emacs.d/config/config-python.el
index aeb7090..19ed001 100644
--- a/users/profiles/emacs/emacs.d/config/config-python.el
+++ b/users/profiles/emacs/emacs.d/config/config-python.el
@@ -1,6 +1,6 @@
 (use-package lsp-python-ms
-  :ensure t
   :hook (python-mode . (lambda ()
+                         (setq indent-tabs-mode nil)  ; disable tabs
                          (require 'lsp-python-ms)
                          (lsp)))
   :init
diff --git a/users/profiles/emacs/emacs.d/config/nix.el b/users/profiles/emacs/emacs.d/config/nix.el
index 65194c4..9805f51 100644
--- a/users/profiles/emacs/emacs.d/config/nix.el
+++ b/users/profiles/emacs/emacs.d/config/nix.el
@@ -9,6 +9,9 @@
 
 (defun nixos-rebuild-test ()
   (interactive)
+  ;; async-shell command should be sufficient, to check why it isn't
   (sudo-utils-shell-command "nixos-rebuild test"))
 
+(global-set-key [f6] 'nixos-rebuild-test)
+
 (provide 'nix)
diff --git a/users/profiles/gtk/default.nix b/users/profiles/gtk/default.nix
index 54e45b6..10d381f 100644
--- a/users/profiles/gtk/default.nix
+++ b/users/profiles/gtk/default.nix
@@ -8,27 +8,25 @@
       package = pkgs.whitesur-gtk-theme;
     };
     iconTheme = {
-      #name = "Adwaita";
-      #package = pkgs.gnome.adwaita-icon-theme;
-      name = "WhiteSur";
-      package = pkgs.whitesur-icon-theme;
+      name = "Adwaita";
+      package = pkgs.gnome.adwaita-icon-theme;
     };
   };
-  home.file.".icons/default" = {
-    recursive = true;
-    source = let
-      drv = pkgs.stdenv.mkDerivation {
-        name = "apple-cursor";
-        src = pkgs.fetchurl {
-          url = "https://github.com/ful1e5/apple_cursor/releases/download/v1.2.0/macOSBigSur.tar.gz";
-          sha256 = "sha256-8QNd8EEf11MIBVUbgZy6U1ZnDIWj92EGQmKLR8Edqfw=";
-        };
-        installPhase = ''
-          mkdir -p $out
-          mv * $out/
-        '';
-      };
-    in
-      "${drv}/";
-  };
+  # home.file.".icons/default" = {
+  #   recursive = true;
+  #   source = let
+  #     drv = pkgs.stdenv.mkDerivation {
+  #       name = "apple-cursor";
+  #       src = pkgs.fetchurl {
+  #         url = "https://github.com/ful1e5/apple_cursor/releases/download/v1.2.0/macOSBigSur.tar.gz";
+  #         sha256 = "sha256-8QNd8EEf11MIBVUbgZy6U1ZnDIWj92EGQmKLR8Edqfw=";
+  #       };
+  #       installPhase = ''
+  #         mkdir -p $out
+  #         mv * $out/
+  #       '';
+  #     };
+  #   in
+  #     "${drv}/";
+  # };
 }
diff --git a/users/profiles/sway/default.nix b/users/profiles/sway/default.nix
index 4eb35be..55e90e9 100644
--- a/users/profiles/sway/default.nix
+++ b/users/profiles/sway/default.nix
@@ -6,47 +6,71 @@
       let
         modifier = "Mod4";
       in
-      {
-        enable = true;
-        config = {
-          modifier = modifier;
-          menu = "${pkgs.bemenu}/bin/bemenu-run -b -m 1 -p 'λ'";
-          output = {
-            HDMI-A-2 = {
-              #bg = "~/dotfiles/dotfiles/xorg/wallpaper.jpg fill";
-            };
-          };
-          #fonts = [ "Font Awesome" "Fira Code" ];
-          terminal = "${pkgs.foot}/bin/footclient";
-          bars = [
-            {
-              command = "${pkgs.waybar}/bin/waybar";
-            }
-          ];
-          startup = [
-            {
-              command = "foot --server";
-              always = true;
-            }
-          ];
-          window.commands = [
-            { criteria = { app_id = "mpv"; }; command = "sticky enable"; }
-            { criteria = { app_id = "mpv"; }; command = "floating enable"; }
-            { criteria = { title = "MetaMask Notification.*"; }; command = "floating enable"; }
-          ];
-          input = {
-            "*" = {
-              xkb_layout = "us";
-              xkb_variant = "intl";
+        {
+          enable = true;
+          wrapperFeatures.gtk = true;
+          config = {
+            modifier = modifier;
+            menu = "${pkgs.bemenu}/bin/bemenu-run -b -m 1 -p 'λ'";
+            output = {
+              HDMI-A-2 = {
+                #bg = "~/dotfiles/dotfiles/xorg/wallpaper.jpg fill";
+              };
+            };
+            #fonts = [ "Font Awesome" "Fira Code" ];
+            terminal = "${pkgs.foot}/bin/footclient";
+            bars = [
+              {
+                command = "${pkgs.waybar}/bin/waybar";
+              }
+            ];
+
+            startup = let
+              gsettings = "${pkgs.glib}/bin/gsettings";
+              gsettingsscript = pkgs.writeShellScript "gsettings-auto.sh" ''
+                expression=""
+                for pair in "$@"; do
+                  IFS=:; set -- $pair
+                  expressions="$expressions -e 's:^$2=(.*)$:${gsettings} set org.gnome.desktop.interface $1 \1:e'"
+                done
+                IFS=
+                echo "" >/tmp/gsettings.log
+                echo exec sed -E $expressions "''${XDG_CONFIG_HOME:-$HOME/.config}"/gtk-3.0/settings.ini &>>/tmp/gsettings.log
+                eval exec sed -E $expressions "''${XDG_CONFIG_HOME:-$HOME/.config}"/gtk-3.0/settings.ini &>>/tmp/gsettings.log
+              '';
+              gsettingscmd = ''${gsettingsscript} \
+    gtk-theme:gtk-theme-name \
+    icon-theme:gtk-icon-theme-name \
+    font-name:gtk-font-name \
+    cursor-theme:gtk-cursor-theme-name'';
+            in
+              [
+                {
+                  command = "foot --server";
+                  always = true;
+                }
+
+                #{ always = true; command = "${gsettingscmd}"; }
+              ];
+            window.commands = [
+              { criteria = { app_id = "mpv"; }; command = "sticky enable"; }
+              { criteria = { app_id = "mpv"; }; command = "floating enable"; }
+              { criteria = { title = "MetaMask Notification.*"; }; command = "floating enable"; }
+            ];
+            input = {
+              "*" = {
+                xkb_layout = "us";
+                xkb_variant = "intl";
+              };
             };
           };
+          extraConfig = ''
+            bindsym ${modifier}+p move workspace to output right
+            #seat seat0 xcursor_theme "Adwaita"
+          '';
+          xwayland = true;
+          systemdIntegration = true;
         };
-        extraConfig = ''
-          bindsym ${modifier}+p move workspace to output right
-        '';
-        xwayland = true;
-        systemdIntegration = true;
-      };
   };
 
   programs.waybar = {
@@ -62,7 +86,7 @@
           "sway/mode"
           "sway/workspaces"
         ];
-        modules-center = [ ];
+        modules-center = [];
         modules-right = [
           "idle_inhibitor"
           "tray"