diff --git a/configuration.nix b/configuration.nix
index 06430f6..0d656b8 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -22,12 +22,6 @@ in
     device = "/dev/sda";
   };
 
-  # Hostname and networking
-  networking = {
-    hostName = "freecornserver";
-    networkmanager.enable = true;
-  };
-
   # Enable network manager applet
   programs.nm-applet.enable = true;
 
@@ -49,6 +43,29 @@ in
     # Enable the LXQT Desktop Environment.
 #    displayManager.lightdm.enable = true;
 #    desktopManager.lxqt.enable = true;
+#  };
+
+  # Enable automatic login for the user.
+#  services.displayManager.autoLogin = {
+#    enable = true;
+#    user = "freecorn";
+#  };
+
+  # Enable sound with pipewire.
+#  hardware.pulseaudio.enable = false;
+#  security.rtkit.enable = true;
+#  services.pipewire = {
+#    enable = true;
+#    alsa.enable = true;
+#    alsa.support32Bit = true;
+#    pulse.enable = true;
+#  };
+
+  # OpenGL and drivers
+#  hardware.opengl = {
+#    enable = true;
+#    driSupport = true;
+#    driSupport32Bit = true;
 #  };
 
   # Printer Stuff (FUCK HP!)
@@ -65,15 +82,11 @@ in
     };
   };
 
-  # Enable sound with pipewire.
-#  hardware.pulseaudio.enable = false;
-#  security.rtkit.enable = true;
-#  services.pipewire = {
-#    enable = true;
-#    alsa.enable = true;
-#    alsa.support32Bit = true;
-#    pulse.enable = true;
-#  };
+  # Install fonts, need this for orbitron!
+#  fonts.packages = with pkgs; [
+#    orbitron
+#  ];
+
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.nextcloud = {
@@ -81,13 +94,6 @@ in
     isSystemUser = true;
   };
 
-#  # OpenGL and drivers
-#  hardware.opengl = {
-#    enable = true;
-#    driSupport = true;
-#    driSupport32Bit = true;
-#  };
-
   # RTL-SDR Support
   hardware.rtl-sdr.enable = true;
   boot.kernelParams = [ "modprobe.blacklist=dvb_usb_rtl28xxu" ]; # blacklist dunb driver
@@ -98,12 +104,6 @@ in
   # OpenWebRX
 #  services.openwebrx.enable = true;
 
-  # Enable automatic login for the user.
-#  services.displayManager.autoLogin = {
-#    enable = true;
-#    user = "freecorn";
-#  };
-
   # PufferPannel
   services = {
     pufferpanel = {
@@ -221,14 +221,12 @@ in
     defaults.email = secrets.cornEmail;
   };
 
-  # Install firefox.
-#  programs.firefox.enable = true;
-
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
   # Packages installed in system profile
   environment.systemPackages = with pkgs; [
+    # firefox
     wget
     x11vnc
     fastfetch
@@ -242,11 +240,6 @@ in
     qbittorrent
   ];
 
-  # Install fonts, need this for orbitron!
-  fonts.packages = with pkgs; [
-    orbitron
-  ];
-
   # Enable the OpenSSH daemon.
   services.openssh = {
   enable = true;
@@ -258,18 +251,24 @@ in
     openFirewall = true;
   };
 
-  # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 
-    1935 # RTMP
-    4455 # VR
-    80 443 # Nginx
-    1234 # Something
-    25565 # minecraft port
-  ];
-  networking.firewall.allowedUDPPorts = [ 
-    4455
-    24454 # minecraft vc mod 
-  ];
+  # Hostname and networking
+  networking = {
+    hostName = "freecornserver";
+    networkmanager.enable = true;
+    firewall = {
+      allowedTCPPorts = [ 
+        1935 # RTMP
+        4455 # VR
+        80 443 # Nginx
+        1234 # Something
+        25565 # minecraft port
+        2049
+      ];
+      allowedUDPPorts = [ 
+        4455
+        24454 # minecraft vc mod 
+      ];
+    };
 
   # Copy and link the NixOS configuration file to (/run/current-system/configuration.nix).
   system.copySystemConfiguration = true;