diff --git a/.etckeeper b/.etckeeper
index 48bdbeef..86b20647 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -88,6 +88,9 @@ maybe chmod 0644 'X11/rgb.txt'
 maybe chmod 0755 'X11/xkb'
 maybe chmod 0644 'adduser.conf'
 maybe chmod 0644 'aliases'
+maybe chmod 0755 'alsa'
+maybe chmod 0755 'alsa/conf.d'
+maybe chmod 0644 'alsa/conf.d/20-bluealsa.conf'
 maybe chmod 0755 'alternatives'
 maybe chmod 0644 'alternatives/README'
 maybe chmod 0755 'apache2'
@@ -3126,6 +3129,11 @@ maybe chmod 0644 'letsencrypt/csr/1983_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/1984_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/1985_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/1986_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/1987_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/1988_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/1989_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/1990_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/1991_csr-certbot.pem'
 maybe chmod 0700 'letsencrypt/keys'
 maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem'
@@ -5114,6 +5122,11 @@ maybe chmod 0600 'letsencrypt/keys/1983_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/1984_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/1985_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/1986_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/1987_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/1988_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/1989_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/1990_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/1991_key-certbot.pem'
 maybe chmod 0700 'letsencrypt/live'
 maybe chmod 0755 'letsencrypt/live/5f3b42dd7a0ab1cb.natalieandjoshua.com'
 maybe chmod 0644 'letsencrypt/live/5f3b42dd7a0ab1cb.natalieandjoshua.com/README'
@@ -5210,6 +5223,7 @@ maybe chmod 0755 'network/if-up.d/avahi-daemon'
 maybe chmod 0755 'network/if-up.d/bind9'
 maybe chmod 0644 'network/interfaces'
 maybe chmod 0755 'network/interfaces.d'
+maybe chmod 0644 'network/interfaces.new'
 maybe chmod 0644 'networks'
 maybe chmod 0755 'nftables.conf'
 maybe chmod 0755 'nginx'
@@ -5299,7 +5313,7 @@ maybe chmod 0644 'profile.d/bash_completion.sh'
 maybe chmod 0644 'profile.d/gawk.csh'
 maybe chmod 0644 'profile.d/gawk.sh'
 maybe chmod 0644 'profile.d/sshpwd.sh'
-maybe chmod 0644 'profile.d/wifi-country.sh'
+maybe chmod 0644 'profile.d/wifi-check.sh'
 maybe chmod 0644 'protocols'
 maybe chmod 0755 'pulse'
 maybe chmod 0644 'pulse/client.conf'
diff --git a/alsa/conf.d/20-bluealsa.conf b/alsa/conf.d/20-bluealsa.conf
new file mode 100644
index 00000000..b798ede4
--- /dev/null
+++ b/alsa/conf.d/20-bluealsa.conf
@@ -0,0 +1,74 @@
+# BlueALSA integration setup
+
+defaults.bluealsa.interface "hci0"
+defaults.bluealsa.profile "a2dp"
+defaults.bluealsa.delay 20000
+defaults.bluealsa.battery "yes"
+
+ctl.bluealsa {
+	@args [ HCI BAT ]
+	@args.HCI {
+		type string
+		default {
+			@func refer
+			name defaults.bluealsa.interface
+		}
+	}
+	@args.BAT {
+		type string
+		default {
+			@func refer
+			name defaults.bluealsa.battery
+		}
+	}
+	type bluealsa
+	interface $HCI
+	battery $BAT
+}
+
+pcm.bluealsa {
+	@args [ HCI DEV PROFILE DELAY ]
+	@args.HCI {
+		type string
+		default {
+			@func refer
+			name defaults.bluealsa.interface
+		}
+	}
+	@args.DEV {
+		type string
+		default {
+			@func refer
+			name defaults.bluealsa.device
+		}
+	}
+	@args.PROFILE {
+		type string
+		default {
+			@func refer
+			name defaults.bluealsa.profile
+		}
+	}
+	@args.DELAY {
+		type integer
+		default {
+			@func refer
+			name defaults.bluealsa.delay
+		}
+	}
+	type plug
+	slave.pcm {
+		type bluealsa
+		interface $HCI
+		device $DEV
+		profile $PROFILE
+		delay $DELAY
+	}
+	hint {
+		show {
+			@func refer
+			name defaults.namehint.extended
+		}
+		description "Bluetooth Audio Hub"
+	}
+}
diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index 2659e717..4c9e1b29 100644
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -1,36 +1,42 @@
 // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal
 APT::NeverAutoRemove
 {
-   "^linux-image-4\.14\.98-v7\+$";
    "^linux-image-4\.19\.42-v7\+$";
-   "^linux-headers-4\.14\.98-v7\+$";
+   "^linux-image-4\.19\.50-v7l\+$";
    "^linux-headers-4\.19\.42-v7\+$";
-   "^linux-image-extra-4\.14\.98-v7\+$";
+   "^linux-headers-4\.19\.50-v7l\+$";
    "^linux-image-extra-4\.19\.42-v7\+$";
-   "^linux-modules-4\.14\.98-v7\+$";
+   "^linux-image-extra-4\.19\.50-v7l\+$";
    "^linux-modules-4\.19\.42-v7\+$";
-   "^linux-modules-extra-4\.14\.98-v7\+$";
+   "^linux-modules-4\.19\.50-v7l\+$";
    "^linux-modules-extra-4\.19\.42-v7\+$";
-   "^linux-signed-image-4\.14\.98-v7\+$";
+   "^linux-modules-extra-4\.19\.50-v7l\+$";
    "^linux-signed-image-4\.19\.42-v7\+$";
-   "^kfreebsd-image-4\.14\.98-v7\+$";
+   "^linux-signed-image-4\.19\.50-v7l\+$";
+   "^linux-image-unsigned-4\.19\.42-v7\+$";
+   "^linux-image-unsigned-4\.19\.50-v7l\+$";
    "^kfreebsd-image-4\.19\.42-v7\+$";
-   "^kfreebsd-headers-4\.14\.98-v7\+$";
+   "^kfreebsd-image-4\.19\.50-v7l\+$";
    "^kfreebsd-headers-4\.19\.42-v7\+$";
-   "^gnumach-image-4\.14\.98-v7\+$";
+   "^kfreebsd-headers-4\.19\.50-v7l\+$";
    "^gnumach-image-4\.19\.42-v7\+$";
-   "^.*-modules-4\.14\.98-v7\+$";
+   "^gnumach-image-4\.19\.50-v7l\+$";
    "^.*-modules-4\.19\.42-v7\+$";
-   "^.*-kernel-4\.14\.98-v7\+$";
+   "^.*-modules-4\.19\.50-v7l\+$";
    "^.*-kernel-4\.19\.42-v7\+$";
-   "^linux-backports-modules-.*-4\.14\.98-v7\+$";
+   "^.*-kernel-4\.19\.50-v7l\+$";
    "^linux-backports-modules-.*-4\.19\.42-v7\+$";
-   "^linux-modules-.*-4\.14\.98-v7\+$";
+   "^linux-backports-modules-.*-4\.19\.50-v7l\+$";
    "^linux-modules-.*-4\.19\.42-v7\+$";
-   "^linux-tools-4\.14\.98-v7\+$";
+   "^linux-modules-.*-4\.19\.50-v7l\+$";
    "^linux-tools-4\.19\.42-v7\+$";
-   "^linux-cloud-tools-4\.14\.98-v7\+$";
+   "^linux-tools-4\.19\.50-v7l\+$";
    "^linux-cloud-tools-4\.19\.42-v7\+$";
+   "^linux-cloud-tools-4\.19\.50-v7l\+$";
+   "^linux-buildinfo-4\.19\.42-v7\+$";
+   "^linux-buildinfo-4\.19\.50-v7l\+$";
+   "^linux-source-4\.19\.42-v7\+$";
+   "^linux-source-4\.19\.50-v7l\+$";
 };
 /* Debug information:
 # dpkg list:
@@ -38,13 +44,13 @@ APT::NeverAutoRemove
 
 # list of different kernel versions:
 
-# Installing kernel:  (4.19.42-v7+)
-# Running kernel: ignored (4.14.98-v7+)
+# Installing kernel:  (4.19.50-v7l+)
+# Running kernel: ignored (4.19.42-v7+)
 # Last kernel: 
 # Previous kernel: 
 # Kernel versions list to keep:
 
 # Kernel packages (version part) to protect:
-4\.14\.98-v7\+
 4\.19\.42-v7\+
+4\.19\.50-v7l\+
 */
diff --git a/dhcpcd.conf b/dhcpcd.conf
index 8d7a5af4..b34f11a0 100644
--- a/dhcpcd.conf
+++ b/dhcpcd.conf
@@ -26,15 +26,18 @@ option rapid_commit
 # A list of options to request from the DHCP server.
 option domain_name_servers, domain_name, domain_search, host_name
 option classless_static_routes
-# Most distributions have NTP support.
-option ntp_servers
 # Respect the network MTU. This is applied to DHCP routes.
 option interface_mtu
 
+# Most distributions have NTP support.
+#option ntp_servers
+
 # A ServerID is required by RFC2131.
 require dhcp_server_identifier
 
-# Generate Stable Private IPv6 Addresses instead of hardware based ones
+# Generate SLAAC address using the Hardware Address of the interface
+#slaac hwaddr
+# OR generate Stable Private IPv6 Addresses based from the DUID
 slaac private
 
 # Example static IP configuration:
@@ -54,4 +57,3 @@ slaac private
 # fallback to static profile on eth0
 #interface eth0
 #fallback static_eth0
-
diff --git a/letsencrypt/csr/1987_csr-certbot.pem b/letsencrypt/csr/1987_csr-certbot.pem
new file mode 100644
index 00000000..e1fa17bf
--- /dev/null
+++ b/letsencrypt/csr/1987_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICiDCCAXACAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANhW
+vQVtMdxfTneE2unZINXvTEXVg6AB6H1G8TdNoL3Bt9ZBjT+W1XxE2IfeaPie73+Y
+Nrg4+JkEgpE2XiN/rPMw1Ix1Rthf8iwBQN02wYrt7kO+4BlS2yGQvVrwHmqc2PGA
+5D674PcCmwRsmCRJUBJCi4qp1F8m57QPsRU92ae3bCBYcRKDQ5TTNqH1UtPUuQ4c
+iehS8Edw1NZrI0mUpd2X2GA+U+ssQnot+2eSkmoY9h5Wyf39lRn0LFAwldwQTbZB
+h2e2UDSDyrYYI8pW9YNkStg4gKQL5sFLzs5Kp5gCBB9HRDozOWBR2UaOTe1lvGbd
+SM1uff2l6q2pyQZ1mM0CAwEAAaBDMEEGCSqGSIb3DQEJDjE0MDIwMAYDVR0RBCkw
+J4IlNWYzYjQyZGQ3YTBhYjFjYi5uYXRhbGllYW5kam9zaHVhLmNvbTANBgkqhkiG
+9w0BAQsFAAOCAQEAJ537RJZcw8zGHcbjBY8wqZnmm8yQj4Hg41KRlNX0haCFbZCB
+eas5uD0bJUUmXwYAlT0BdGvwvRY3TOqSKvlGjr2HPiBW0VQT6x0nLjWlo2sAu/2z
+hvhsG3p6wJ/7fwSzltnqm52z0cWjYZvBDu/xPhUnmgI+LdKzCpRNWJ/Y4d4VWBXu
+dIYlNQufOoFDWwO2E+/QFaMSYkI/P0IXeQkLYaZ5G9J+IYy087X5nLygAhYHToLR
+ohtLcctPMiXxfeQeWDb952buRH1cb+QM3OrxghKm3B7H4O7qgkAYhAE2ubm87Iv7
+6cIdlSz9/Q1cfLuxOV/UhnAdS2wV65Waqgt/fg==
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/csr/1988_csr-certbot.pem b/letsencrypt/csr/1988_csr-certbot.pem
new file mode 100644
index 00000000..d33656fb
--- /dev/null
+++ b/letsencrypt/csr/1988_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICezCCAWMCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAS
+y7RIvMciZclUDzueI/4ftKdpHcW2T6hs7NUQt75Qv/XfD+5wouUBg9xLlejf0PVn
+OQeDDk7bYF+b0Uz74woi+Q4m/IH9LvBF2zj51dmOLn8YVGklvSLpegDck7JtL3n4
+SI3H2cFPgTYnSmmlcIURQdK5VX4DwVgG5Ecke62UdrSMiHeXiujDyr+4c6KsoQKH
+7RE5TPermq6EcQjNpzzTAZA5vOTVZhBgEDWiwzPv+SdbAWfiXxUZZJCoV2x+k9wk
+iRTSRlUjCdf8yT3NFFvXmnj/NUkZDFtGpN6W1QMjMIXCmWa6QKHk+1MRKAYtzT1i
+IFzGr4U40G7pjqcv9ZsCAwEAAaA2MDQGCSqGSIb3DQEJDjEnMCUwIwYDVR0RBBww
+GoIYcnNzLm5hdGFsaWVhbmRqb3NodWEuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBz
+8pY2W6OxpxXKY6HbnoKBFSXoc16aKYYZ01nsMzOb91CCl4W8uozKdDHIl3C4WmfQ
+uJmVLhdw3U9hEkI8tsU62jo9HMveipzsX+5HDWlN/u6ah46EadmmBcvx40cfJwiw
+AsVfuBTgLz/FE7z6sQGvd9DibIoj8VaqUHyZ1XqeDj4x75E82mEou6edv6crR0tV
+MZoUaePzoZ6WpkoCdUVOLZ0mw47wZVkxz986ECsFVxOCcGswU1Bz+8Q+jE4L6eqF
+2hT9I/DpcczrE1Rn1HgZx2hn/mU2pcABpuQdKq99Kf+yy11Io2xTJYhHBTplmhw3
+Yjbki5dATeIcVZpY7q0M
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/csr/1989_csr-certbot.pem b/letsencrypt/csr/1989_csr-certbot.pem
new file mode 100644
index 00000000..20f80096
--- /dev/null
+++ b/letsencrypt/csr/1989_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALvf
+yWg1cmxhEl2LPmECeUbgU1/fiuBc0oamooXeP1wtOnZCxAPEozzXxq2gm/LgCekE
+YOJYqSmWa/r/jYCUTeZaBFTC4ne/Fz6jezVFkFQiH+YwE/4y5v3CTUo1iVDbyuRD
+vri3okgSIv3owO0o4jtAMSPyEs8NUUbwkupL5Y9rtj510YoRTu26vTFkifMeemsH
+/DB8DdS8y8ESsez+L42ON5zejPYhJevxIpy8n2RWzmvLz7tDijpYfi16nZKq6mOp
+/91OIszfnScd+AX0QBy2jG4TjyIKy8LOkbFWkvqasKEwuwPWv2/+JZR63xMSHM2t
+AwzsLnOuztvvaNHwRBECAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
+FIISdnBuLm92YWx3b25kZXIuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBrzHQdva5p
+IrCceJ+yAY0kb7H3B6Mz1g0sofYkmqN/VfzzDi4WD/49dmbbS545gVUXIQnBmGn9
+IAlSxC8+RE/oYnpHupW0BWaxFNpinqXvlb6cBBP1CyQ5K+xa7XKNTcgpwAwPyeX8
+CYMV39hDygQ3zTKPvbelo6tlWJRxqB/TjdcTXS5rqG/NMGezWqJH4Wxu/F6DkSFV
+zE/+VpxX01pgwtQhAo6aPjXXUp6bYe+V3CS86N/C5sseLgGkRCq62UCGLVlUTFV/
+taPX5byD0gKQRuY24oIaHId4ziQlytBsOLilG5Ya7X6Qa99fJtpqvXCVZw4sEkRS
+9jh2rFQ8NE9t
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/csr/1990_csr-certbot.pem b/letsencrypt/csr/1990_csr-certbot.pem
new file mode 100644
index 00000000..bf1d4b31
--- /dev/null
+++ b/letsencrypt/csr/1990_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICfDCCAWQCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnZ
+72MR3QsU2girgoJRjpVHwIKQlIu9g/i1JDuYo7K24KdT62q4CMAG0icSUWdKgNoG
+gkS2eWW9dadISSpbl4Wj3JAH14ULqbwyHAPZ1EhKnefAPfCC3VPZ/7tAMlqYQl7e
+5JPNpePIZzF76RruUoMqTzuTMsZW1Uvpi8orNf79HEVzaW9EHb77r7/hOUb7bzRz
+bdipWkiyZZVlvSROLGIzqgYj2AJ8Z56U7n4127SMUXHhoJfuhSL+AotrWC21b5DT
+LNaC3oitEPxqi1nQFSYotQzlh1HoEKRZuoI/FRSodunKkuvNdhkccG/e+aBKW5/o
+hm0G85f0H1R5ha1wVvkCAwEAAaA3MDUGCSqGSIb3DQEJDjEoMCYwJAYDVR0RBB0w
+G4IZd2lmaS5uYXRhbGllYW5kam9zaHVhLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEA
+RzGH6inc61Yk3bG4vIOQ2IYZ6Gj3mJ4cC+kQ+1epJ3jbuKb+9/aUt/AMelD1AdK4
+0PyslFfzW9ozEWZ573pPQa2+GBfHHhs848SWat2S5rECF0RNZ9Q7Kg2wHYe2CDhI
+D8KNM+U+N4syIn3kfWwQAt7RrDpu7H7irlg8ZwshYS6wS1qbYXGRM8jlh18Fc8or
+uU3vHa4VBNW82M/RrYrYrC7gwpM6SMO7BQzGU90ZyRABmRTrjp2rFuyPYoIY75A2
+n5fmIVOpsxMm9qvqJ8VIByvX6naRc9aubS7mP/8FvtcFs9wqLAB2VJEzhx8BHJn2
+grNcvp12htJCscH+JdVAjA==
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/csr/1991_csr-certbot.pem b/letsencrypt/csr/1991_csr-certbot.pem
new file mode 100644
index 00000000..9824fdb9
--- /dev/null
+++ b/letsencrypt/csr/1991_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICfTCCAWUCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqm
+Zwwyfb3eHcf3oLeQGIpOXhZ5DuETw2L71XNxWWyz5r+Cd50FgiQnNvlLi6kROKpa
+Du2PWZkTGLhenCV09vBAn1Qq0sJbkg5RcTl7qMcMkf3z0HPQkGhZ2QKOXWxnpRgT
+tI1GfdaXXB/3r6Z+y/o7U4U5WaoG+zDgVwJqNebWYn0giyW63apTKZJjUzI1ZFY0
+Y7bv26TV425sX0veRKhK1olc7OJIC54kzkDepmo1SWUARZkzgTqHto3iJvuLV/On
+92Fb7S1QlQqxcQeNUxWaKLsk1DAd2G5JgYCJr8B7oT5tuNGHg3a+ICzoU35NypDi
+Yjr+96Se21uEah4ll2MCAwEAAaA4MDYGCSqGSIb3DQEJDjEpMCcwJQYDVR0RBB4w
+HIIad2lmaTIubmF0YWxpZWFuZGpvc2h1YS5jb20wDQYJKoZIhvcNAQELBQADggEB
+AF3eDG6CBCNR0JmYfCjOtpyK32AcZUutHdne4du+Hris8wo5h3egnp1uuIeZYwZ5
+USVE4kJT6c98WGjK5q+ByTtHmWKotpWX6RhRxk6q7WEcXxK5j0cGWNnVKfPyx9hO
+XPue5f/S1X4CYuIvSOVERncjGvUHhUQ79z7ZW0Bm9hR+zqESGPu1ec60+fFaUCkq
+ysjRaQxiPpm+tgdkoZVhCs1oscLFXnOe6kL2UbK+KzGh5dZVYmnllIhfH4mZXZKw
++KaxclpoFDzVjz7pQDCGHksrC7DV1eEOxdftVPYTbSPbbNfyML3HXNBNVWmfq4yK
+z+ZYMvKLd8Bn944iA+QzsHs=
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/keys/1987_key-certbot.pem b/letsencrypt/keys/1987_key-certbot.pem
new file mode 100644
index 00000000..a5a99867
--- /dev/null
+++ b/letsencrypt/keys/1987_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDYVr0FbTHcX053
+hNrp2SDV70xF1YOgAeh9RvE3TaC9wbfWQY0/ltV8RNiH3mj4nu9/mDa4OPiZBIKR
+Nl4jf6zzMNSMdUbYX/IsAUDdNsGK7e5DvuAZUtshkL1a8B5qnNjxgOQ+u+D3ApsE
+bJgkSVASQouKqdRfJue0D7EVPdmnt2wgWHESg0OU0zah9VLT1LkOHInoUvBHcNTW
+ayNJlKXdl9hgPlPrLEJ6LftnkpJqGPYeVsn9/ZUZ9CxQMJXcEE22QYdntlA0g8q2
+GCPKVvWDZErYOICkC+bBS87OSqeYAgQfR0Q6MzlgUdlGjk3tZbxm3UjNbn39peqt
+qckGdZjNAgMBAAECggEBANSP/S98x9X4iveiQRot7jZl5nJjRO4Nkeqtrsqg6oQn
+98J8LBXD1UVBu+Nb45YNS9L5syI1UAXBSaz2V27Xvw4/90d+37owI5mbLaltaKNh
+/o7v1+7p20dSmMrmTWyBaiN4ekstfPAWzkt9i8tzgUo/ui3nijRn3JeuJ1dwqxA+
+uQEkvIVYpwVrCZy5g4Jge6X0hB7vklzHY7AMgfCFRh/QXRrZAq8AUuaYMKLZ0TQN
+OCN+hs6ergc6j0u8r1h7rmKOqY6wffV4G86Kbg4MTj+u0k69EOe1ZT0ojUzIObzl
+CaU0hnR10rU3fsu0ahVlgg7yvEWNFkX+nyOBkaaDTWECgYEA9hoFjDR9Mk0AhC+Y
+JjZCogCilpdAcpbmget+CiydPIYDuSdhWTQkh20h53fKOHsXvsaDJf78NWm+0Mgg
+zf/GGUeypCgg5+biFGIDXZLoTVWudLPh1QtdW3wJs9p6q9/Z6JWX23VmaUowuRmN
+cnAuzQkPxEQmDyNZ3M9HFYVNeHkCgYEA4QpDv5R1cCpmRErHTj3Qj/Ta2uef/izb
+oXk6QZ/QaZKEytv8LXqsPKS9RNYSGSXgy2UkbWUSmfV4AZUoRR5hQoAiUF5wHimk
+95XK7eozeKBo4Y6/ZYodM2NSi+bHQ0N4WD58fMAHOr1HNzq79A4WLKPszwaUga9M
+LEP5kvjSdfUCgYEAnfq6UPRo4d9YU4KR8wWl5ITv2ieh8W0473GSaUmWbgHBZhwH
+e9HjGSRPPV1CbNtntMmN6tgyYr9NBI1TsaldK2FBJeu0o+kse9UnP+xMP0ifQr8u
+Wyp+dXm8aL35PVfndEyDPRex9Cjx+gCTMkEdafVFL8JnhBQ3XW2ZvhDiWFECgYEA
+qqDYy3rqLHjJf8BfK/DsoSobgt0az2L9yIodZMKjCFkivJldtLINxBF4vKe/oze4
+IR/4JcX7+6ZGLpUEqpulTQHQgrWINyaGQX9fFVN9YVnnDBbrAjddeqg1X4RE07hl
+mCsQwpnrIVuAktzCxAKmR4SnOjWYBlh+3hVQN2LYWL0CgYEA1EMBYDAgafAr3CbF
+Sdzax6D1piW1fLhms3Rm/bo+z3lySSkfbWY8gK8r1QVt5vyHRI50MS6z+WX82Y4t
+tBUg+fl588RdTqdhHQaf7pQmCVKMvpc1NGVizo3fvwSHSDhcQu+OaN41SZQkm7EL
+WmMUXyccsptwmrxnSrmjcTxYjFE=
+-----END PRIVATE KEY-----
diff --git a/letsencrypt/keys/1988_key-certbot.pem b/letsencrypt/keys/1988_key-certbot.pem
new file mode 100644
index 00000000..0d78c8bf
--- /dev/null
+++ b/letsencrypt/keys/1988_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDQEsu0SLzHImXJ
+VA87niP+H7SnaR3Ftk+obOzVELe+UL/13w/ucKLlAYPcS5Xo39D1ZzkHgw5O22Bf
+m9FM++MKIvkOJvyB/S7wRds4+dXZji5/GFRpJb0i6XoA3JOybS95+EiNx9nBT4E2
+J0pppXCFEUHSuVV+A8FYBuRHJHutlHa0jIh3l4row8q/uHOirKECh+0ROUz3q5qu
+hHEIzac80wGQObzk1WYQYBA1osMz7/knWwFn4l8VGWSQqFdsfpPcJIkU0kZVIwnX
+/Mk9zRRb15p4/zVJGQxbRqTeltUDIzCFwplmukCh5PtTESgGLc09YiBcxq+FONBu
+6Y6nL/WbAgMBAAECggEAE51R+qLIuPTzJ3F3JiWYOwJ+IzHzjonLJJNwF/3FdHlk
+PydR9yZDFNd5uLCfZx6CMkASzjR6itB/W0PzDRDJrFDzrXPbZd2aKShMrChREnsm
+wvBmNKtMExhzWdVxTuagDR1sqYDndCOsiJBXoXHpE4I29EhoWMK93TB5IIO97PTg
+KM0ovg+M7Q4zMq8LYpIyVzLItRujgGHHuquy44m887vztN9vxLZ58oYB+KklnCdf
+aQ5EA5NxyZIoinPPo/ImJ1HHrobBbrM9xWOqWk9wujMWyJ+SLR1UmgT1RppnEned
+6pRCZSjx6NywfJdMVkTcqhT+F06YJdLt+orjZNeBkQKBgQD/A3i+5nLg3iKFv8ov
+/gvNddYgRRPMbX0jOTSaBKX/XKLMnt5orWD1DEgeV2M+H7fbOJWHn3txLBq3uoWB
+aDFAhHCBQDgUR0E0BNZNusDCpi1Hu4MQFgkGz2r751Jb6L4PdlgozAFb49dXEuAX
+iheMH6Q9mbUaMAobpR6WMXXwxwKBgQDQ4Ndj/rEDWvjGVJ5ewlCQ3EpgUaSwhfwS
+/tMht80i4jkDw5ACvp0F0UsO2LtoBNi/Bf1fL8Tvhoq6kYBQmTyUq34JpBo9GV+z
+0e44og1FSxiWtZjepQknooBHRlfhEygI2kkqrqO3VcWmhKez2UV0SyvadkxdNZAC
+YYAjJsrojQKBgQC7gJb4bkMLWekyRHlqXjXZZQoDAidziRGYo4gssrxHDZraLvnD
+J7ABnX0taf2bgQDTXEB9zuKZrN8cNjXRl4WXNYnvTwOszVOA5wmXb3gp5rumYZYV
+bs5GRp4YB9bDo1aT0eUyYgWhxd3gtQ014aA8tEszy9+gGLBl8TuTHVzlowKBgQCM
+7kclZqCUPPsBBfLcyIqHUrq0BiHyIFSVlG1roJG96ZjCW159G5Lia/YSjFTVt/9t
+02LCqH5dhg9wFd/XgayIOrUNWDWD5+zUbN4oQ95kVGjAtsHv5rYokdGvRVzhtYUb
+g/w92hsIBc0XrwVfqUbdUiLCgXLAqPUDRjmoffIFuQKBgD08vW8LNaGdcdF1Z+L3
+7D41u/mFZSsjC6mwUqoGc22Dls86gQr4I0cei+qty7VZ3k+rdvSxeAkpoLz68S+y
+9E02X26eas2w1KywVE+MgeuFAxYAljKvrxjvbyKhpT8XDMb6w9WBx7FsA6kDJegZ
+YO+Q8yHy9+cXBEO/yjcRQvq0
+-----END PRIVATE KEY-----
diff --git a/letsencrypt/keys/1989_key-certbot.pem b/letsencrypt/keys/1989_key-certbot.pem
new file mode 100644
index 00000000..a368f290
--- /dev/null
+++ b/letsencrypt/keys/1989_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC738loNXJsYRJd
+iz5hAnlG4FNf34rgXNKGpqKF3j9cLTp2QsQDxKM818atoJvy4AnpBGDiWKkplmv6
+/42AlE3mWgRUwuJ3vxc+o3s1RZBUIh/mMBP+Mub9wk1KNYlQ28rkQ764t6JIEiL9
+6MDtKOI7QDEj8hLPDVFG8JLqS+WPa7Y+ddGKEU7tur0xZInzHnprB/wwfA3UvMvB
+ErHs/i+Njjec3oz2ISXr8SKcvJ9kVs5ry8+7Q4o6WH4tep2Squpjqf/dTiLM350n
+HfgF9EActoxuE48iCsvCzpGxVpL6mrChMLsD1r9v/iWUet8TEhzNrQMM7C5zrs7b
+72jR8EQRAgMBAAECggEBAJdDgQf0MGJubbj/SYQV18tnBfnlJA2s7pwXQjeCT4VJ
+rQ5Whzd5dOyh1ocpDyanl5MTQWY8eEbRo7L9WtKxlV7oDyCnoGtFYdO/EI49qgzz
+RLey8gXyueSKMmyTWjHOJTdQDBjxUSmx4JaKdfr8tdl6v5Xva5FlaZEyVTdrUDL9
+5iHyh4zYz5O+2sKikpZ1w3eXkOEw79ktkDVh1PctM/7LSAokUHnXdVaSK1JR4z+a
+ckdJYzQlPJQUzgTW6PGXaZqVBX4pPquCgIH6K4sG0vqjoVDrYU6NRYadsZg035w6
+0WWqJbU10UTEcNP0R2NM1h3JxW6YAShpdJ+b3gpw1rkCgYEA7G7S9eeRUpra87CO
+KsRgEPcsWdtbhDCj4UfNV4U1QT30BLo6zj6HuuPWBG/CMnmW9y5PYA7CPNDo1iK4
+VsPQFHPR/7Ucgy3bDMnsv8nZGThIvN9iu5srKACzWKslSjd2jdDI8r5fJOy9PfdA
+AiVe2rFclMRCgrOJpDrx1ShivQcCgYEAy2wsyqg7mGW0vb7VoODJVBHerbrqLNk8
+KTXLZsMtvdzf/+rHZrzDABekptzQZyVjLPWvEy9eyNcQ7GSqFmfr3mXrT0V0he7e
+n88puK4gdaVuxYgC9AX0LlcS7OweIYbc2SeU0We7R/vnniE6Je2IwFO4WKnN7tsi
+9XgvpakIyCcCgYBBsAisiUm2yY9LZSIaf7SxAfswe+FROLJPRMOoLTo+hhfluFfe
+NUFAi0xKr0IlA+MNibBD39XXT7NgywSsFnsZM5SElqz1RSg2xWMhZdMLTrfmwamM
+te+njYpGeEZD+GTXwcoSpxGIEL4DGU6PShKwb9Zo/p378iWrmzTVJANKwQKBgDIF
+GIKAmZ7gq2/Y5AjaHUdZ2YqYooqCpENx4eET70R3cnEoVv3RPpXgOnF5bJlgXSGq
+C/HIvSLfl165ZgV6akpWf2UPrBZe5UkglJ6/2mVzV2ilCCze5esbKCEv8jzGP7n5
+/KL9QdTygUKl4vl+jhjUvUi4AFZSdicr9XNjvDATAoGBAJtJybPC+XZqa0zC9tjV
+2IHBLI0ROVpqN3IA7BNdX0nX4jrTVL8JjHKo1AQv17mLG6uADAmboIfG2dsPWLaI
+hCGCqJIHS0XDfOH61L6y1Pn3JKScfFdiXuTtcaDt6y1ibpdrEFfGODospKZgNo3W
+yIiRweiIIVUtdJeBnDWCy6Be
+-----END PRIVATE KEY-----
diff --git a/letsencrypt/keys/1990_key-certbot.pem b/letsencrypt/keys/1990_key-certbot.pem
new file mode 100644
index 00000000..2af1a7f6
--- /dev/null
+++ b/letsencrypt/keys/1990_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCZ2e9jEd0LFNoI
+q4KCUY6VR8CCkJSLvYP4tSQ7mKOytuCnU+tquAjABtInElFnSoDaBoJEtnllvXWn
+SEkqW5eFo9yQB9eFC6m8MhwD2dRISp3nwD3wgt1T2f+7QDJamEJe3uSTzaXjyGcx
+e+ka7lKDKk87kzLGVtVL6YvKKzX+/RxFc2lvRB2++6+/4TlG+280c23YqVpIsmWV
+Zb0kTixiM6oGI9gCfGeelO5+Ndu0jFFx4aCX7oUi/gKLa1gttW+Q0yzWgt6IrRD8
+aotZ0BUmKLUM5YdR6BCkWbqCPxUUqHbpypLrzXYZHHBv3vmgSluf6IZtBvOX9B9U
+eYWtcFb5AgMBAAECggEAOWvJmOQ158jkh4/bqd/eo4CgLRrhFjapZs3UtBmIH096
+EXmUx8PgICtrjAGeODrqVHVRcWvZa0uG+eRUymZc6xf5XhhPK+zqcL8TDazjOgf/
+X1u0wmtVR9J5S93t7Toeq2HtVezPGXDWcvWYTuDcEvBbmhSaQsRt32NPNSljgcNK
+AW2s0kOpzWpOz+nQiMGPXeT0LMtGYxiGWWWO8Ufx832StLEa6kQYFmCxoCf/BZW5
+Dmiw52VrJ42k3wcKpdtkP6Ra7IoM7XTBPTKPcaM9SZqiYvZSDkoD/VU6qbXAfbaS
+vKvXvWzTcT9Rf2ol36TrXK17lmdamelCxoYCZAiJcQKBgQDHMjD6AdTYLvT61LjG
+sF3DwPSSLGRp5uiH2DIHV+oXmQTo1XmjGkUGufeFef4gdGShb+6voOl2wOc2D98A
+TyAaEgnQTygA94KuMetOYxwfY/UOIQUt6eTUN1qkgto0ZJOnEzehijwcW+rNhs0a
+wUCRK5Q1PFKksKqf7Bo4M9nXJwKBgQDFuXbIrseayXZ7X7OZiX2O/TnCqWLsIP55
+dDvJUb2C5RG4P9JbzjqeiIFccsOmguD+NWx6/ZFxNusr981h/cA5CaTe7TNUjOtv
+igc04b4k7kkg5axNIjlicgHkEI3W+xyiwh4C/iJb+l7c59wFCF70AkhB6TYTsbPI
+rCRukXY03wKBgD0HbKf8TajaYiZDbEU7nc6u3H+4aB9mJpIQM+u6DLekIzPuy7Ck
+CMfxzBsx8CEjZ/1qHNfkVgMTQQN4Q1uF4pD6O9V9mwUI0Bnso2pFxUT8zATDKyIR
+ChHWz8eda5snwXEr2xx8DMSniL3lcgujb9PKZUMWMz/P/Ma4gKP9ht17AoGAY0bu
+F3F6k4OYU/YHbY4VVxhaSh1WqA0g+MadxkWei/yMWyDgdGwmDrenjE2rYw3P/pPA
+djifMGNMzXTM0Ojh/UGUYMJkxY1EIWsCl1DJci2a1kO7sbb/bSilPmf5b/oBtM8W
+1pXXlqstumlIldZQJuCGe2GnX1gYVyfn2wR6f60CgYEAmr12JFFoU9c5U+Aq8ADs
+DEkDdXk2VwdxZrGFBZDFuGmvyYHKpIQXzfCtR0MMxG+F5YNrj8oWpGBPcftRyB0A
+qmLr0+YrHPRaTepuT4ZR9DwHylflt+a8Q9/H6E6kwDO27sVJQfT7LGhCj3vjhhjz
+rG6n4Gvxlf82xu9Uh7xB+ME=
+-----END PRIVATE KEY-----
diff --git a/letsencrypt/keys/1991_key-certbot.pem b/letsencrypt/keys/1991_key-certbot.pem
new file mode 100644
index 00000000..c86c7914
--- /dev/null
+++ b/letsencrypt/keys/1991_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC6pmcMMn293h3H
+96C3kBiKTl4WeQ7hE8Ni+9VzcVlss+a/gnedBYIkJzb5S4upETiqWg7tj1mZExi4
+XpwldPbwQJ9UKtLCW5IOUXE5e6jHDJH989Bz0JBoWdkCjl1sZ6UYE7SNRn3Wl1wf
+96+mfsv6O1OFOVmqBvsw4FcCajXm1mJ9IIslut2qUymSY1MyNWRWNGO279uk1eNu
+bF9L3kSoStaJXOziSAueJM5A3qZqNUllAEWZM4E6h7aN4ib7i1fzp/dhW+0tUJUK
+sXEHjVMVmii7JNQwHdhuSYGAia/Ae6E+bbjRh4N2viAs6FN+TcqQ4mI6/veknttb
+hGoeJZdjAgMBAAECggEAUrb5hbM+fAzZ38tCYvatmWUfVxAw4tfyR4RY1H8P5RdY
+k9gKkABn6wOh3hp3euYR2ZRtdyOGzkpjMxliU0shP9kzgoYzvkP8VvIKnjHJ2uQc
+MpGA+EIeLNBcVkCm8CqCREg/RDhP/fA3uEb4hW09kdgGrEx9CtdrK/7PMFfHKVNo
+rE5YrtftkcCkTMc2KZkQZoDqLeO+qEmPjOwUg2apk0zpg6aFxC375rO7VZWzIyN5
+xtAO2vzS6XHMqQE/94tT6kwlOx+RN0gSBYIqQeQs2FdD2A2EnKARBr5vkNKAq4nJ
+BNQRmsLSr/QSUVYbdSDbMfbHBh2NmollE7JHtSYqMQKBgQDe79774xBbwX04R5xL
+T8f6ejAjHZo+j9mVBE9WhyBy2xnkt+NyKxlJaCsXG3ax9ClxgLN0G004soZCug3T
+o/iLbbdkfCCy5F1cBVy9IwFpVwkz43BKrzyGMTuUU2qBMIKArxgiKxvp9AF0uBue
+GQzlFNEuxYVkJZLIqSn9gl946wKBgQDWVNfP3D6qwkCx120bCkRbAsMvtkpw13VU
+v3V1KAkT/XSG8jPXTAteHa+Vw0PToONirH8v+WTMiPyTvNwMHSFubnmXP1gMU9Dc
+b9XEVNJwubDawfTlFcKbENGvcigQBQ1ni+5gH/7DSyDaaFdKzu2PpoSlFDXf1EZU
+4lPWFEc9aQKBgE56JgaJUdLa89eB7dTdCspzhMp3uzpWrQM19y/AdX24/w5yZRBl
+d4tNrg1+T3QpPQWFhqZSjgZtYbHPiNp9mBqMzsgCoggXN34TLSgvUGnih4zKfVbt
+BONAJXb7Pjyn9OiTum0cu8DJclHCFYa7zrw9bb2HLoOobllQo0VoRW9tAoGAWqlk
+6K4XbA/jYdbodgmvxHe0rNgFQRpCrWiXfMlEncoWooaNW0L1hAg2n7kLVde2l6Sz
+4E00UDiZ7rxysEUaQSZGFK5cxkomDTjZScU/hyNlJgPpXYYI3aMNr5MwUyZv9x7/
+5HVkRKPg78I3OpOxdZRQg6u65kVawslCAUpuoBECgYEAiuX0U6GrT4WgZIz1r/rX
+49Yr90rb23rbLp2aiDhYP2Xk4CKKxe8/Zl/CviNMhBRzu4nMukrwsPjh9OPeNhkt
+ws7CMAhVADUWw9Gt1hFEso/3Jc2YSYcufnv+ARBZBWTJxPLDfx3feYpwSjVOxz6x
+RNJQK1fB9Pjbk4BFu8Vmj58=
+-----END PRIVATE KEY-----
diff --git a/network/interfaces.new b/network/interfaces.new
new file mode 100644
index 00000000..e46d1ee1
--- /dev/null
+++ b/network/interfaces.new
@@ -0,0 +1,7 @@
+# interfaces(5) file used by ifup(8) and ifdown(8)
+
+# Please note that this file is written to be used with dhcpcd
+# For static IP, consult /etc/dhcpcd.conf and 'man dhcpcd.conf'
+
+# Include files from /etc/network/interfaces.d:
+source-directory /etc/network/interfaces.d
diff --git a/profile.d/at-dbus-fix.sh b/profile.d/at-dbus-fix.sh
index ec620a07..eaf4da55 100644
--- a/profile.d/at-dbus-fix.sh
+++ b/profile.d/at-dbus-fix.sh
@@ -1,3 +1,3 @@
-if ! /usr/bin/dpkg -l at-spi2-core 2> /dev/null | /bin/grep -q ii ; then
+if ! [ -e /usr/share/dbus-1/services/org.a11y.Bus.service ] ; then
    export NO_AT_BRIDGE=1
 fi
diff --git a/profile.d/wifi-check.sh b/profile.d/wifi-check.sh
new file mode 100644
index 00000000..03153837
--- /dev/null
+++ b/profile.d/wifi-check.sh
@@ -0,0 +1,18 @@
+(
+        export TEXTDOMAIN=wifi-check
+
+        . gettext.sh
+
+        if [ ! -x /usr/sbin/rfkill ]; then
+                exit 0
+        fi
+
+        if ! /usr/sbin/rfkill list wifi | grep -q "Soft blocked: yes" ; then
+                exit 0
+        fi
+
+        echo
+        /usr/bin/gettext -s "Wi-Fi is currently blocked by rfkill."
+        /usr/bin/gettext -s "Use raspi-config to set the country before use."
+        echo
+)
diff --git a/profile.d/wifi-country.sh b/profile.d/wifi-country.sh
deleted file mode 100644
index a58b8e96..00000000
--- a/profile.d/wifi-country.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-(
-	export TEXTDOMAIN=wifi-country
-
-	. gettext.sh
-
-	if [ ! -f /run/wifi-country-unset ]; then
-		exit 0
-	fi
-
-	if ! /bin/grep -q '^Revision\s*:\s*[ 123][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]0[dD][0-9a-fA-F]$' /proc/cpuinfo ; then
-		exit 0
-	fi
-
-	if /sbin/iw reg get | /bin/grep -q "country [A-Z][A-Z]:" ; then
-		exit 0
-	fi
-
-	echo
-	/usr/bin/gettext -s "Wi-Fi is disabled because the country is not set."
-	/usr/bin/gettext -s "Use raspi-config to set the country before use."
-	echo
-)