diff --git a/.gitmodules b/.gitmodules
index e3533f6..71fb489 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,6 @@
 [submodule "pkgbuilds/screencfg-git"]
 	path = pkgbuilds/screencfg-git
 	url = https://aur.archlinux.org/screencfg-git.git
+[submodule "pkgbuilds/aws-sam-cli-git"]
+	path = pkgbuilds/aws-sam-cli-git
+	url = https://aur.archlinux.org/aws-sam-cli.git
diff --git a/alacritty/alacritty.toml.j2 b/alacritty/alacritty.toml.j2
index 859b349..3841504 100644
--- a/alacritty/alacritty.toml.j2
+++ b/alacritty/alacritty.toml.j2
@@ -12,19 +12,19 @@ WINIT_X11_SCALE_FACTOR = "1"
 size = {{ machine.font_size_2 }}
 
 [font.bold]
-family = "Inconsolata"
+family = "JetBrainsMono"
 style = "Bold"
 
 [font.bold_italic]
-family = "Inconsolata"
+family = "JetBrainsMono"
 style = "Bold Italic"
 
 [font.italic]
-family = "Inconsolata"
+family = "JetBrainsMono"
 style = "Italic"
 
 [font.normal]
-family = "Inconsolata"
+family = "JetBrainsMono"
 style = "Regular"
 
 [selection]
diff --git a/i3/config.j2 b/i3/config.j2
index eca15da..1eb1af6 100644
--- a/i3/config.j2
+++ b/i3/config.j2
@@ -288,7 +288,7 @@ assign [class="^Wine$"] $workspace10
     floating_minimum_size 0 x 0
     floating_maximum_size 0 x 0
 
-    font pango:Inconsolata {{ machine.font_size_1 }}
+    font pango:JetBrainsMono {{ machine.font_size_1 }}
 
 ################################################################################
 ### COLOR SETTINGS #############################################################
@@ -349,7 +349,7 @@ bar {
 
     id bar-0
 
-    font pango:Inconsolata, FontAwesome {{ machine.font_size_1 }}
+    font pango:JetBrainsMono, FontAwesome {{ machine.font_size_1 }}
 
     colors {
         background #272822
diff --git a/packages.yml b/packages.yml
index fa2debc..def1037 100644
--- a/packages.yml
+++ b/packages.yml
@@ -63,6 +63,8 @@ font-awesome:
     - awesome-terminal-fonts
 font-inconsolata:
   archlinux: ["ttf-inconsolata"]
+font-jetbrainsmono:
+  archlinux: ["ttf-jetbrains-mono"]
 font-dejavu:
   archlinux: ["ttf-dejavu"]
 font-libertine:
diff --git a/pkgbuilds/aws-sam-cli-git b/pkgbuilds/aws-sam-cli-git
new file mode 160000
index 0000000..9219d76
--- /dev/null
+++ b/pkgbuilds/aws-sam-cli-git
@@ -0,0 +1 @@
+Subproject commit 9219d76a4b72930006ec2bdd680cd1078a521f9b