diff --git a/.circleci/config.yml b/.circleci/config.yml
index e6c4748..89d5255 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,8 +12,8 @@ jobs:
           name: install AWS CLI
           command: |
             sudo apt update
-            sudo apt install python-pip
-            pip install awscli
+            sudo apt install python3-pip
+            pip3 install awscli
 
       # build with hugo
       - run: HUGO_ENV=production hugo -v --minify
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index a6851ba..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "themes/terminal"]
-	path = themes/terminal
-	url = https://github.com/panr/hugo-theme-terminal.git
diff --git a/config/_default/config.toml b/config/_default/config.toml
index a60bfba..98adb9b 100644
--- a/config/_default/config.toml
+++ b/config/_default/config.toml
@@ -1,4 +1,7 @@
 baseURL = "https://alejandr0angul0.dev/"
 languageCode = "en-us"
-theme = "terminal"
+theme = "alejandro-angulo"
 
+[markup]
+  [markup.highlight]
+	noClasses = false
diff --git a/config/_default/languages.toml b/config/_default/languages.toml
index 2b28f54..3876603 100644
--- a/config/_default/languages.toml
+++ b/config/_default/languages.toml
@@ -1,6 +1,6 @@
 [en]
 languageName = "English"
-title = "Alejandr00"
+title = "alejandr00"
 subtitle = ""
 owner = ""
 keywords = ""
@@ -24,4 +24,3 @@ missingBackButtonLabel = "Back to home page"
     identifier = "gh"
     name = "github"
     url = "https://github.com/alejandro-angulo"
-
diff --git a/config/_default/params.toml b/config/_default/params.toml
index 107ffa7..f869ad7 100644
--- a/config/_default/params.toml
+++ b/config/_default/params.toml
@@ -37,3 +37,6 @@ showLastUpdated = false
   creator = "alejandr0angul0"
   site = "alejandr0angul0"
 
+[markup]
+  [markup.highlight]
+	codeFences = false
diff --git a/content/posts/X1C6-arch-linux-install.md b/content/posts/X1C6-arch-linux-install.md
new file mode 100644
index 0000000..368dfd7
--- /dev/null
+++ b/content/posts/X1C6-arch-linux-install.md
@@ -0,0 +1,607 @@
++++
+title = "Arch Linux X1 Carbon 6"
+date = "2020-07-30T17:56:45-07:00"
+author = ""
+authorTwitter = "" #do not include @
+cover = ""
+tags = ["info-dump"]
+keywords = ["arch", "linux", "thinkpad", "X1", "carbon", "LUKS", "install"]
+description = ""
+showFullContent = false
++++
+
+I recently picked up a 6th gen X1 Carbon so of course I wanted to install Arch Linux on it. This post documents the steps I took
+in case I ever have to do this again. I used [ejmg's
+guide](https://github.com/ejmg/an-idiots-guide-to-installing-arch-on-a-lenovo-carbon-x1-gen-6) guide, [HardenedArray's gist
+guide](https://gist.github.com/HardenedArray/ee3041c04165926fca02deca675effe1), and the [Arch Linux wiki
+page](https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)) as references.
+
+_Note_: This was my setup as of July 2020ish. Things have changed since then.
+
+## Setup
+
+### Prepare Installation Media
+
+This part is relatively straighforward. Check out the [arch wiki
+page](https://wiki.archlinux.org/title/USB_flash_installation_medium).
+
+### Prepare BIOS
+
+BIOS -> Security -> Secure Boot -> Disable
+BIOS -> Config  -> Thunderbolt(TM) 3 -> Thunderbolt BIOS Assist Mode: Enabled
+
+Configure boot order to boot off USB
+BIOS -> Startup -> Boot -> Move USB HDD to the top of the list (also moved USB FDD to 2nd since I wasn't sure which one I needed
+
+Plug in USB
+
+## Live Environment Setup
+
+### Connect to WiFi Network
+
+I was able to get everything set up with `iwctl`. Once you're in the `iwctl` prompt, use the `help` command to see available
+commands.
+
+```bash
+# iwctl
+[iwd]# device list
+
+# Shows devices installed. Mine was wlan0
+
+[iwd]# station wlan0 get-networks
+
+# Shows available networks
+
+[iwd]# station wlan0 connect $SSID
+
+# Wrap your SSID in quotes if it has spaces
+# Enter passphrase when prompted
+
+[iwd]# exit
+```
+
+### Partition Drive
+
+TODO: Rewrite this section to have more of a focus on what commands to run (too much time spent describing)
+
+My device had two SSDs installed. `lsblk` showed them as `nvme0n1` and `nvme1n1`. My primary SSD was `nvme1n1` so I ran `gdisk
+/dev/nmve1n1`. You can enter `?` to get a list of commands. I went ahead and deleted (`d`) all the existing partitions. Created an
+EFI partition (`n`) on partition 1 with a size of 100 MiB (chose first sector and then `+100M` for the last sector) with hex code
+EF00 (EFI partition). I created partition 2 to span the rest of the device. I tried having a separate boot partition but ran into
+issues getting my system to boot up properly. It's probably possible to have a separate boot partition but it probably makes the
+setup more complex. So, unless you know what you're doing, don't create any other partitions on this drive.
+
+For my second drive I ran `gdisk /dev/nvme0n1` and left a single partition spanning the entire device with hex code 8300 (Linux
+FS). This drive can be partitioned however you like.
+
+I should zero my devices but I'm not that paranoid so I didn't. This could be done with `ddrescue` or with `cat` like so `cat
+/dev/zero > /dev/nvme1n1 && cat /dev/zero /dev/nme0n1`.
+
+### Setup filesystems
+
+#### Encrypting Devices
+
+Encrypt all partitions except for the EFI partition. This is done with `cryptsetup`'s `luksFormat` subcommand. `luksFormat` will
+prompt for a password. **Do not** forget these passwords or you'll be locked out of your drives and be forced to reformat. The
+passwords don't have to match. In fact, it's better to have a unique password for each one but **do not** forget the passwords. Once
+the drives are encrypted, they need to be opened with the `luksOpen` subcommand. The last part of the `luksOpen` (`EncryptedBoot`
+and `Secondary` below) subcommand is just a label and can be any value (just be sure to remain consistent -- these labels will be
+used later on).
+
+These are the commands I ran:
+
+```bash
+cryptsetup -c aes-xts-plain64 -h sha512 -s 512 --use-random --type luks1 luksFormat /dev/nvme1n1p2
+cryptsetup -c aes-xts-plain64 -h sha512 -s 512 --use-random --type luks1 luksFormat /dev/nme0n1p1
+cryptsetup luksOpen /dev/nvme1n1p2 EncryptedBoot
+cryptsetup luksOpen /dev/nvme0n1p1 Secondary
+```
+
+When I first tried setting this up I realized I had accidentally encrypted the EFI partition (saw an error when I tried to mount
+it later on). Fixing this is easy though, just close the partition with `cryptsetup luksClose EncryptedBoot`. Replace
+`EncryptedBoot` with whatever label was given (this can be checked with `lsblk`). Once the partition is closed, reformat it with
+FAT32 again (see the [`Create FileSystems`](#create-filesystems) section).
+
+#### LVM
+
+Use the Linux Volume Manager (LVM) to create a swap volume on the primary drive (labeled `EncryptedBoot`). Setup volumes for the
+secondary drive (labeled `Secondary`) while we're at it.
+
+```bash
+pvcreate /dev/mapper/EncryptedBoot
+vgcreate Arch /dev/mapper/EncryptedBoot
+lvcreate -L 16G -n swap
+lvcreate -l 100%FREE Arch -n root
+pvcreate /dev/mapper/Secondary
+vgcreate Data /dev/mapper/Secondary
+lvcreate -l 100%FREE Data -n root
+```
+
+#### Create Filesystems
+
+Create a FAT32 filesystem for the EFI partition, set up the swap partition, and format the rest with ext4.
+
+
+```bash
+mkfs.vfat -F 32 /dev/nvme1n1p1
+mkswap /dev/mapper/Arch-swap
+mkfs.ext4 /dev/mapper/Arch-root
+mkfs.ext4 /dev/mapper/Data-root
+```
+
+## Installation
+
+### Bootstrap
+
+Now that the drives are ready, the actual installation can begin. Mount the drives first.
+
+```bash
+mount /dev/mapper/Arch-root /mnt
+swapon /dev/mapper/Arch-swap
+mkdir /mnt/boot
+mkdir -p /mnt/mnt/data
+mount /dev/mapper/Data-root /mnt/mnt/data
+mkdir /mnt/efi
+mount /dev/nvme1n1p1 /mnt/efi
+```
+
+Install a base set of packages. More will be installed later on, this is just a minimal set of packages.
+
+```bash
+pacstrap /mnt base base-devel grub efibootmgr dialog wpa_supplicant linux linux-headers vim dhcpcd netctl lvm2 linux-firmware iwd
+man-db man-pages
+```
+
+_Note:_ Later on when I was configuring my network after Arch had been installed I realized I didn't use `netctl` or `dhcpcd`.
+These can probably be left out. Not sure if `wpa_supplicant` needs to be installed here either. `vim` could be replaced with a
+different editor like `emacs` or `nano`.
+
+One last step before chroot'ing into the Arch installation is to write an `/etc/fstab` file. This can be generated with `genfstab`.
+
+```bash
+genfstab -U /mnt >> /mnt/etc/fstab
+```
+
+Before continuing, review `/mnt/etc/fstab` and make any necessary changes (I didn't need to make any changes but it's a good idea
+to check). It's finally time to chroot.
+
+```bash
+arch-chroot /mnt /bin/bash
+```
+
+The root is now the same as the Arch install's root.
+
+### Housekeeping
+
+Find the local timezone in `/usr/share/zoneinfo` and set the system timezone.
+
+```bash
+ln -s /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
+```
+
+Set the hostname. I decided on naming my computer `carbon`.
+
+```bash
+echo carbon > /etc/hostname
+```
+
+Set the locale. Go through `/etc/locale.gen` and uncomment the relevant lines. I only uncommented `en_US.UTF-8 UTF-8`. After that,
+generate localization files.
+
+```bash
+echo LANG=en_US.UTF-8 > /etc/locale.conf
+locale-gen
+```
+
+Set the root password and create a user account (bad practice to run as root).
+
+```bash
+passwd
+useradd -m -G wheel -s /bin/bash alejandro
+```
+
+Replace `alejandro` with your username. `sudo` will later be configured to allow users in the `wheel` group.
+
+### More Encryption Configuration
+
+When the system boots up, the bootloader (I'll be using `grub`) will need to read `/boot` and the system will need access to any
+other volumes specified in the fstab file.  Without any extra configuration, there will be a passphrase prompt for every volume.
+LUKS devices have multiple "key slots." It's possible to use a key file to fill in one of the key slots and later pass that file
+in to open (decrypt) a LUKS device. This makes it possible to have `grub` handle decryption of root and swap without requiring the
+user to enter multiple passphrases (which is clunky and error-prone). Other volumes (my data root volume) can be configured in
+`/etc/crypttab` (similar to `/etc/fstab`) to also be automatically opened.
+
+Generate a random keyfile.
+
+```bash
+cd /
+dd bs=512 count=4 if=/dev/random of=crypto_keyfile.bin iflag=fullblock
+```
+
+This keyfile should **never** be shared. In fact, no user should have access to this file. The [arch wiki
+warns](https://wiki.archlinux.org/index.php/Dm-crypt/Device_encryption#With_a_keyfile_embedded_in_the_initramfs) that initramfs's
+permissions should be set to 600 as well.
+
+```bash
+chmod 000 /crypto_keyfile.bin
+chmod 600 /boot/initramfs-linux*
+```
+
+Add the keyfile to the LUKS devices.
+
+```bash
+cryptsetup luksAddKey /dev/nvme1n1p2 /crypto_keyfile.bin
+cryptsetup luksAddKey /dev/nvme0n1p1 /crypto_keyfile.bin
+# Use the commands below to verify the keyfile has been added.
+cryptsetup luksDump /dev/nvme1n1p2  # Should see slots 0 and 1 occupied
+cryptsetup luksDump /dev/nvme0n1p1  # Should see slots 0 and 1 occupied
+```
+
+Configure automatic opening of the data volume through `crypttab`. Edit `/etc/crypttab`
+
+```plaintext
+# SNIP ...
+# <name>       <device>                                     <password>              <options>
+Secondary      /dev/nvme0n1p1                               /crypto_keyfile.bin     discard
+# SNIP ...
+```
+
+The `discard` option has to do with the `TRIM` command and is basically a performance optimization. Read more about it on
+[wikipedia](https://en.wikipedia.org/wiki/Trim_(computing)).
+
+Edit the `mkinitpcio` configuration file (`/etc/mkinitpcio.conf`) to setup decryption.
+
+```plaintext
+# SNIP ...
+FILES=(/crypto_keyfile.bin)
+# SNIP ...
+HOOKS=(base udev autodetect modconf block keymap encrypt lvm2 resume filesystems keyboard fsck)
+```
+
+Generate the initrd image.
+
+```bash
+mkinitpcio -p linux
+```
+
+`grub` now has to be configured so it knows `/boot` is encrypted. Uncomment the `GRUB_ENABLE_CRYPTODISK=y` line in
+`/etc/default/grub`. Once that's done `grub` can be installed.
+
+```bash
+grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=ArchLinux
+```
+
+Open up `/etc/default/grub` again and edit the `GRUB_CMDLINE_LINUX` line so it looks like this
+`GRUB_CMDLINE_LINUX=cryptdevice/nvme1n1p2:EncryptedBoot:allow-discards resume=/dev/mapper/Arch-swap`.
+
+The `allow-discards` option also has to do with `TRIM`. Now the `grub` configuration is ready to be generated.
+
+```bash
+grub-mkconfig -o /boot/grub/grub.cfg
+```
+
+That's it. The system should now be bootable. Exit, reboot, and pray.
+
+```bash
+exit
+umount -R /mnt
+swapoff -a
+reboot
+```
+
+You should be prompted for your passphrase once. If you get the passphrase wrong you'll be dropped into grub rescue mode. Hit
+`ctrl+alt+delete` and try again (or reboot by holding down the power button if that doesn't work). Don't be frustrated if this
+doesn't work on the first try. There are a lot of steps in setting this up and mistakes happen (I didn't get this right at first
+either).
+
+### First Logon
+
+Log in to your system as root and alow users in the wheel group to use `sudo`. Run `visudo`, if you get an error saying no editor
+found just prepend the editor's path like this `EDITOR=/usr/bin/vim visudo`. Uncomment the following line `%wheel ALL=(ALL) ALL`.
+You can log out and log in with your own user account now.
+
+### Setup WiFi
+
+`iwd` can be used to manage the network with the proper configuration. Edit `/etc/iwd/main.conf`
+
+```plaintext
+[General]
+EnableNetworkConfiguration=true
+
+[Network]
+NameResolvingService=systemd
+```
+
+The `EnableNetworkConfiguration` setting allows `iwd` to handle stuff like DHCP. The `NameResolvingService` configures DNS. I
+decided to use `systemd-resolved` mostly just because I already had it installed (part of the `systemd` package). Enable and start
+`systemd-resolved` and `iwd`.
+
+```bash
+systemctl enable systemd-resolved
+systemctl enable iwd
+systemctl start systemd-resolved
+systemctl start iwd
+```
+
+Follow the same steps as before to connect to wifi (run `iwctl`).
+
+### Install Additional Packages
+
+The default mirrorlist was kept earlier but `reflector ` can be used to choose mirrors. The `reflector` command below will filter
+the 200 most recently updated https servers and choose the 200 fastest ones.
+
+```bash
+pacman -S reflector
+reflector --verbose -l 200 -n 20 -p https --sort rate --save /etc/pacman.d/mirrorlist
+```
+
+A [pacman hook](https://wiki.archlinux.org/index.php/Pacman#Hooks) can be setup to automatically run reflector when
+`pacman-mirrorlist` is updated (this package contains the official mirrorlist). Create `/etc/pacman.d/hooks/mirrorupgrade.hook`
+
+```plaintext
+[Trigger]
+Operation = Upgrade
+Type = Package
+Target = pacman-mirrorlist
+
+[Action]
+Description = Updating pacman-mirrorlist with reflector and removing pacnew...
+When = PostTransaction
+Depends = reflector
+Exec = /bin/sh -c "reflector -l 200 -n 20 -p https --sort rate --save /etc/pacman.d/mirrorlist; rm -f /etc/pacman.d/mirrorlist.pacnew"
+```
+
+Make sure everything is up-to-date.
+
+```bash
+sudo pacman -Syyu
+```
+
+Some packages are only available from the Arch User Repository (AUR). `pacman` won't handle these packages, but there are AUR
+helpers that can. Install `yay`.
+
+```bash
+sudo pacman -S git
+cd ~
+git clone https://aur.archlinux.org/yay.git
+cd yay
+makepkg -si
+# clean up
+cd ..
+rm -rf yay
+```
+
+Set up `zsh`.
+
+```bash
+yay -S zsh oh-my-zsh-git
+zsh  # runs setup
+chsh -s /usr/bin/zsh  # set zsh as default shell
+cp /usr/share/oh-my-zsh/zshrc ~/.zshrc
+```
+
+I normally use `i3` but I've been wanting to switch to `wayland` so I went with `sway` since it's the closest thing (the about
+section on GitHub bills it as an "i3-compatible Wayland compositor").
+
+```bash
+yay -S sway swaylock swayidle waybar xorg-server-xwayland
+# Can probably leave the 2 lines below out
+mkdir -p ~/.config/sway
+cp /etc/sway/config ~/.config/sway
+mkdir -p ~/.config/waybar
+cp /etc/xdg/waybar/* ~/.config/waybar
+```
+I edited my sway config to mimic my i3 config so I needed to grab a few packages first.
+
+```bash
+yay -S termite bemenu-wlroots
+```
+
+`termite` is the terminal emulator that I'm used to an I used `bemenu` as an alternative to `dmenu`.
+
+With that out of the way, I started up sway and realized I still needed a web browser.
+
+```bash
+yay -S firefox
+```
+
+Firefox wouldn't run when I tried to start it. I came to find out that Firefox's wayland support needs to be enabled so I updated my
+`~/.zprofile` with an environment variable to enable wayland support in Firefox.
+
+```bash
+echo "export MOZ_ENABLE_WAYLAND=1" >> ~/.zprofile
+```
+
+After restarting sway, I was able to run Firefox. I ran into my next issue (seems like a recurring theme) soon after. Everything
+on the screen seemed too big. The scaling factor for my display was too large (first world problem, I know). Luckily for me sway
+supports (but doesn't reccommend) fractional scaling. I got my display's name using `swaymsg`.
+
+```bash
+swaymsg -t get_outputs
+```
+
+Then I added a line to my sway config to set a custom scaling factor: `output eDP-1 scale 1.75`. `eDP-1` is the name of my
+display, as reported by `swaymsg`.
+
+Next thing I wanted to fix were the fonts. I didn't like the current ones so I installed all the [nerd
+fonts](https://ww(w.nerdfonts.com/). When I looked at the AUR page for `nerd-fonts-complete` there was a pinned comment that
+suggested grabbing the tarball manually since it was so large (~2GB).
+
+```bash
+yay -S wget
+mkdir -p ~/.local/share/fonts
+ln -s /usr/lib/nerd-fonts-complete/*.sh ~/.local/share/fonts/
+echo source ~/.local/share/fonts/i_all.sh >> ~/.zshrc
+```
+
+#### Notifications
+
+```bash
+yay -S mako libnotify
+add line to sway config
+```
+
+#### Terminal Themes
+
+I use themes defined in `base16-shell`.
+
+```bash
+git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell
+```
+
+Follow set up directions in [the repo](https://github.com/chriskempson/base16-shell). I use `base16_darktooth`.
+
+#### Sound
+
+I use pulseaudio
+
+```bash
+yay -S pulseaudio pulseaudio-alsa pamixer pulseaudio-bluetooth
+```
+
+#### Spotify TUI
+
+Spotify can be controlled from the terminal using `spotify-tui` and `spotifyd`. Doesn't have all the features as the official
+client but it's
+
+```bash
+yay -S spotify-tui spotifyd
+```
+
+Set up keyring to use with spotify
+
+```bash
+yay -S gnome-keyring libsecret  # seahorse too?, not sure how to manage purely from cli
+```
+
+Edit `/etc/pam.d/login` to add in `auth optional pam_gnome_keyring.so` and `session optional pam_gnome_keyring.so auto_start`.
+Mine looks like this.
+
+```plaintext
+#%PAM-1.0
+
+auth       required     pam_securetty.so
+auth       requisite    pam_nologin.so
+auth       include      system-local-login
+auth       optional     pam_gnome_keyring.so
+account    include      system-local-login
+session    include      system-local-login
+session    optional     pam_gnome_keyring.so auto_start
+```
+
+Update the `passwd` file to include `password optional pam_gnome_keyring.so`.
+
+We need to run the following when sway starts.
+
+```bash
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+export SSH_AUTH_SOCK
+```
+
+Normally this would be added in `~/.xinitrc` but there isn't (afaik) a wayland equivalent. So I created a start script for sway.
+
+```bash
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+export SSH_AUTH_SOCK
+sway
+```
+
+Store spotify password in keystore `secret-tool --label='Spotify' application rust-keyring service spotifyd
+username <your-username>`. You'll be prompted to create a default keyring if one hasn't already been created.
+
+Create systemd unit file and run spotifyd
+
+```bash
+mkdir -o ~/.config/systemd/user/
+get https://raw.githubusercontent.com/Spotifyd/spotifyd/blob/master/contrib/spotifyd.service -O ~/.config/systemd/user/spotifyd.service
+systemctl --user start spotifyd.service  # do not run these two with sudo
+systemctl --user enable spotifyd.service
+```
+
+Run `spt` and it'll guide you through setup. See the [their readme](https://github.com/Rigellute/spotify-tui#using-with-spotifyd)
+for instructions.
+
+```bash
+git clone --separate-git-dir=$HOME/.myconf /path/to/repo $HOME/myconf-tmp
+rm -r ~/myconf-tmp/
+alias config='/usr/bin/git --git-dir=$HOME/.myconf/ --work-tree=$HOME'  # Add this into .bashrc/.zshrc
+```
+
+#### Backlight Control
+
+```bash
+yay -S light
+usermod -a -G video alejandro  # need to be in video group to control backlight
+# below 2 reload udev rules, so light doesn't requre root permissions
+sudo udevadm control --reload-rule
+sudo udevadm trigger
+# Above 2 commands didn't work for me, but did after a reboot
+# installed wshowkeys and used it to figure out what keys to bind to light commands in sway config
+```
+
+#### Terminal prompt
+
+```bash
+yay -S zsh-theme-powerlevel10k-git
+echo 'source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme' >> ~/.zshrc
+```
+
+Restart terminal and p10k config wizard will run (or manually run `p10k configure`)
+
+#### Vim plugin manager
+
+```
+mkdir -p ~/.vim/bundle
+git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+```
+
+#### Power Management
+
+Read this for power stuffs: https://github.com/erpalma/throttled
+
+```bash
+yay -S throttled
+systemctl enable --now lenovo_fix.service
+```
+
+#### Network printer
+
+```bash
+yay -S cups
+systemctl enable --now org.cups.cupsd.service
+yay -S nss-mdns avahi
+systemctl enable --now avahi-daemon
+```
+
+Update `/etc/nsswitch.conf` to include `hosts: ... mdns_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] dns ...`
+
+Browse to `localhost:631` to configure printer (Brother HL-L2350 for me) (`yay -S brother-hll2350dw`) (`yay -S ghostscript`)
+
+#### QMK
+
+```
+yay -Q python-pip
+pip install --user qmk
+qmk setup
+# CD into qmk directory
+make crkbd:default
+```
+
+Edit `/etc/udev/rules.d/55-caterina.rules`
+
+```plaintext
+# ModemManager should ignore the following devices
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0036", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0036", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9205", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9203", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+```
+
+```bash
+sudo udevadm control --reload-rules
+sudo udevadm trigger
+qmk flash
+```
+
+Had to reboot before this worked for me. Because of avrdude? `qmk doctor` showed udev rules were setup. Had to add user to `uucp`
+group to write to device.
diff --git a/content/posts/hosting-static-site-aws.md b/content/posts/hosting-static-site-aws.md
index d6b8f3f..a5178fa 100644
--- a/content/posts/hosting-static-site-aws.md
+++ b/content/posts/hosting-static-site-aws.md
@@ -128,7 +128,7 @@ aws acm get-certificate --certificate-arn <your cert arn here>
 Since S3 website endpoints don't support HTTPS, we'll configure CloudFront (AWS's CDN service) to serve up our files. The template
 for the JSON required is below. The region name is whatever was configured when `aws configure` was ran earlier.
 
-{{<code language="json">}}
+```json
 {
     "Aliases": {
         "Quantity": 1,
@@ -253,7 +253,7 @@ for the JSON required is below. The region name is whatever was configured when
     "HttpVersion": "http2",
     "IsIPV6Enabled": true
 }
-{{</code>}}
+```
 
 ```bash
 aws create-distribution --distribution-config file://<path to/gc json file>
@@ -316,4 +316,3 @@ aws s3 cp <path to sample 404 file> s3://<your domain name>/404.html
 
 Fire up your site and cross your fingers. If all went well you should see the `It works!` message when you point your browser to
 your URL and a page does not exist message when you try accessing something like `<your domain name here>/foo`.
-
diff --git a/themes/alejandro-angulo/LICENSE b/themes/alejandro-angulo/LICENSE
new file mode 100644
index 0000000..2731ddf
--- /dev/null
+++ b/themes/alejandro-angulo/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Alejandro Angulo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/themes/alejandro-angulo/archetypes/default.md b/themes/alejandro-angulo/archetypes/default.md
new file mode 100644
index 0000000..ac36e06
--- /dev/null
+++ b/themes/alejandro-angulo/archetypes/default.md
@@ -0,0 +1,2 @@
++++
++++
diff --git a/themes/alejandro-angulo/layouts/404.html b/themes/alejandro-angulo/layouts/404.html
new file mode 100644
index 0000000..33290da
--- /dev/null
+++ b/themes/alejandro-angulo/layouts/404.html
@@ -0,0 +1,17 @@
+{{ define "main" }}
+<pre>
+__/\\\\\_____/\\\________________________________________/\\\\\\\\\\\\\\\___________________________________________________/\\\__
+ _\/\\\\\\___\/\\\_______________________________________\/\\\///////////___________________________________________________\/\\\__
+  _\/\\\/\\\__\/\\\___________________/\\\________________\/\\\______________________________________________________________\/\\\__
+   _\/\\\//\\\_\/\\\_____/\\\\\_____/\\\\\\\\\\\___________\/\\\\\\\\\\\_________/\\\\\_____/\\\____/\\\__/\\/\\\\\\__________\/\\\__
+    _\/\\\\//\\\\/\\\___/\\\///\\\__\////\\\////____________\/\\\///////________/\\\///\\\__\/\\\___\/\\\_\/\\\////\\\____/\\\\\\\\\__
+     _\/\\\_\//\\\/\\\__/\\\__\//\\\____\/\\\________________\/\\\______________/\\\__\//\\\_\/\\\___\/\\\_\/\\\__\//\\\__/\\\////\\\__
+      _\/\\\__\//\\\\\\_\//\\\__/\\\_____\/\\\_/\\____________\/\\\_____________\//\\\__/\\\__\/\\\___\/\\\_\/\\\___\/\\\_\/\\\__\/\\\__
+       _\/\\\___\//\\\\\__\///\\\\\/______\//\\\\\_____________\/\\\______________\///\\\\\/___\//\\\\\\\\\__\/\\\___\/\\\_\//\\\\\\\/\\_
+        _\///_____\/////_____\/////_________\/////______________\///_________________\/////______\/////////___\///____\///___\///////\//__
+</pre>
+
+<p>
+	<a href="{{ .Site.BaseURL  }}">Go home</a> or use the navigation at the bottom of the page to navigate to another page.
+</p>
+{{ end }}
diff --git a/themes/alejandro-angulo/layouts/_default/baseof.html b/themes/alejandro-angulo/layouts/_default/baseof.html
new file mode 100644
index 0000000..5f8e2ec
--- /dev/null
+++ b/themes/alejandro-angulo/layouts/_default/baseof.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+    {{- partial "head.html" . -}}
+    <body>
+        {{- partial "header.html" . -}}
+        <div id="content">
+        {{- block "main" . }}{{- end }}
+        </div>
+        {{- partial "footer.html" . -}}
+    </body>
+</html>
diff --git a/themes/alejandro-angulo/layouts/_default/list.html b/themes/alejandro-angulo/layouts/_default/list.html
new file mode 100644
index 0000000..6309d79
--- /dev/null
+++ b/themes/alejandro-angulo/layouts/_default/list.html
@@ -0,0 +1,12 @@
+{{ define "main" }}
+<h1>{{ .Title }}</h1>
+{{ range .Pages.ByPublishDate.Reverse }}
+<p>
+    <h3><a class="title" href="{{ .RelPermalink }}">{{ .Title }}</a></h3>
+    {{ partial "metadata.html" . }}
+    <a class="summary" href="{{ .RelPermalink }}">
+        <p>{{ .Summary }}</p>
+    </a>
+</p>
+{{ end }}
+{{ end }}
diff --git a/themes/alejandro-angulo/layouts/_default/single.html b/themes/alejandro-angulo/layouts/_default/single.html
new file mode 100644
index 0000000..8bc28ad
--- /dev/null
+++ b/themes/alejandro-angulo/layouts/_default/single.html
@@ -0,0 +1,6 @@
+{{ define "main" }}
+<h1>{{ .Title }}</h1>
+{{ partial "metadata.html" . }}
+<br><br>
+{{ .Content }}
+{{ end }}
diff --git a/themes/alejandro-angulo/layouts/index.html b/themes/alejandro-angulo/layouts/index.html
new file mode 100644
index 0000000..b4b6ffa
--- /dev/null
+++ b/themes/alejandro-angulo/layouts/index.html
@@ -0,0 +1,9 @@
+{{ define "main" }}
+{{ $paginator := .Paginate (where .Site.RegularPages.ByPublishDate.Reverse "Type" "posts") }}
+{{ range $paginator.Pages}}
+<p>
+    <h3><a class="title" href="{{ .RelPermalink }}">{{ .Title }}</a></h3>
+	{{ partial "metadata.html" . }}
+</p>
+{{ end }}
+{{ end }}
diff --git a/themes/alejandro-angulo/layouts/partials/footer.html b/themes/alejandro-angulo/layouts/partials/footer.html
new file mode 100644
index 0000000..6df38bd
--- /dev/null
+++ b/themes/alejandro-angulo/layouts/partials/footer.html
@@ -0,0 +1,16 @@
+<div id="site-footer">
+    <div class="lhs">
+        <a class="home-link" href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
+    </div>
+    <div class="rhs">
+        <nav id="nav" class="nav justify-content-center">
+            {{ range .Site.Menus.main }}
+            <a class="nav-link" href="{{ .URL }}">
+            {{ $text := print .Name | safeHTML }}
+            {{ $text }}
+            </a>
+            {{ end }}
+        </nav>
+        <span class="current-page">[{{ .Title }}]</span>
+    </div>
+</div>
diff --git a/themes/alejandro-angulo/layouts/partials/head.html b/themes/alejandro-angulo/layouts/partials/head.html
new file mode 100644
index 0000000..3409cac
--- /dev/null
+++ b/themes/alejandro-angulo/layouts/partials/head.html
@@ -0,0 +1,9 @@
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" type="text/css" href="/css/style.css">
+	<link rel="stylesheet" type="text/css" href="/css/highlight.css">
+    {{ $title := print .Site.Title " | " .Title }}
+    {{ if .IsHome }}{{ $title = .Site.Title }}{{ end }}
+    <title>{{ $title }}</title>
+</head>
diff --git a/themes/alejandro-angulo/layouts/partials/header.html b/themes/alejandro-angulo/layouts/partials/header.html
new file mode 100644
index 0000000..2ff7b9b
--- /dev/null
+++ b/themes/alejandro-angulo/layouts/partials/header.html
@@ -0,0 +1,14 @@
+{{ $currentPage := . }}
+{{ if $currentPage.IsHome  }}
+<pre>
+__/\\\_________________________/\\\\\\_____/\\\\\\___________________________________________________________________________/\\\\\\____________/\\\__
+ _\/\\\________________________\////\\\____\////\\\__________________________________________________________________________\////\\\___________\/\\\__
+  _\/\\\___________________________\/\\\_______\/\\\_____________________________________________________________________________\/\\\___________\/\\\__
+   _\/\\\_____________/\\\\\\\\_____\/\\\_______\/\\\________/\\\\\_______________/\\____/\\___/\\_____/\\\\\_____/\\/\\\\\\\_____\/\\\___________\/\\\__
+    _\/\\\\\\\\\\____/\\\/////\\\____\/\\\_______\/\\\______/\\\///\\\____________\/\\\__/\\\\_/\\\___/\\\///\\\__\/\\\/////\\\____\/\\\______/\\\\\\\\\__
+     _\/\\\/////\\\__/\\\\\\\\\\\_____\/\\\_______\/\\\_____/\\\__\//\\\___________\//\\\/\\\\\/\\\___/\\\__\//\\\_\/\\\___\///_____\/\\\_____/\\\////\\\__
+      _\/\\\___\/\\\_\//\\///////______\/\\\_______\/\\\____\//\\\__/\\\_____________\//\\\\\/\\\\\___\//\\\__/\\\__\/\\\____________\/\\\____\/\\\__\/\\\__
+       _\/\\\___\/\\\__\//\\\\\\\\\\__/\\\\\\\\\__/\\\\\\\\\__\///\\\\\/_______________\//\\\\//\\\_____\///\\\\\/___\/\\\__________/\\\\\\\\\_\//\\\\\\\/\\_
+        _\///____\///____\//////////__\/////////__\/////////_____\/////__________________\///__\///________\/////_____\///__________\/////////___\///////\//__
+</pre>
+{{ end }}
diff --git a/themes/alejandro-angulo/layouts/partials/metadata.html b/themes/alejandro-angulo/layouts/partials/metadata.html
new file mode 100644
index 0000000..501f336
--- /dev/null
+++ b/themes/alejandro-angulo/layouts/partials/metadata.html
@@ -0,0 +1,11 @@
+<div class="post-meta">
+	{{ $dateTime := .PublishDate.Format "2006-01-02" }}
+	{{ $dateFormat := .Site.Params.dateFormat | default "Jan 2, 2006" }}
+	<time datetime="{{ $dateTime }}">{{ .PublishDate.Format $dateFormat }}</time>
+	{{ with .Params.tags }}
+	{{ range . }}
+	{{ $href := print (absURL "tags/") (urlize .) }}
+	<a class="btn btn-sm btn-outline-dark tag-btn" href="{{ $href }}">#{{ . }}</a>
+	{{ end }}
+</div>
+{{ end }}
diff --git a/themes/alejandro-angulo/static/css/highlight.css b/themes/alejandro-angulo/static/css/highlight.css
new file mode 100644
index 0000000..84bd15a
--- /dev/null
+++ b/themes/alejandro-angulo/static/css/highlight.css
@@ -0,0 +1,82 @@
+/* Background */ .chroma { color: #f8f8f2; background-color: #282a36 }
+/* Other */ .chroma .x {  }
+/* Error */ .chroma .err {  }
+/* LineTableTD */ .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; }
+/* LineTable */ .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; }
+/* LineHighlight */ .chroma .hl { display: block; width: 100%;background-color: #ffffcc }
+/* LineNumbersTable */ .chroma .lnt { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
+/* LineNumbers */ .chroma .ln { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
+/* Keyword */ .chroma .k { color: #ff79c6 }
+/* KeywordConstant */ .chroma .kc { color: #ff79c6 }
+/* KeywordDeclaration */ .chroma .kd { color: #8be9fd; font-style: italic }
+/* KeywordNamespace */ .chroma .kn { color: #ff79c6 }
+/* KeywordPseudo */ .chroma .kp { color: #ff79c6 }
+/* KeywordReserved */ .chroma .kr { color: #ff79c6 }
+/* KeywordType */ .chroma .kt { color: #8be9fd }
+/* Name */ .chroma .n {  }
+/* NameAttribute */ .chroma .na { color: #50fa7b }
+/* NameBuiltin */ .chroma .nb { color: #8be9fd; font-style: italic }
+/* NameBuiltinPseudo */ .chroma .bp {  }
+/* NameClass */ .chroma .nc { color: #50fa7b }
+/* NameConstant */ .chroma .no {  }
+/* NameDecorator */ .chroma .nd {  }
+/* NameEntity */ .chroma .ni {  }
+/* NameException */ .chroma .ne {  }
+/* NameFunction */ .chroma .nf { color: #50fa7b }
+/* NameFunctionMagic */ .chroma .fm {  }
+/* NameLabel */ .chroma .nl { color: #8be9fd; font-style: italic }
+/* NameNamespace */ .chroma .nn {  }
+/* NameOther */ .chroma .nx {  }
+/* NameProperty */ .chroma .py {  }
+/* NameTag */ .chroma .nt { color: #ff79c6 }
+/* NameVariable */ .chroma .nv { color: #8be9fd; font-style: italic }
+/* NameVariableClass */ .chroma .vc { color: #8be9fd; font-style: italic }
+/* NameVariableGlobal */ .chroma .vg { color: #8be9fd; font-style: italic }
+/* NameVariableInstance */ .chroma .vi { color: #8be9fd; font-style: italic }
+/* NameVariableMagic */ .chroma .vm {  }
+/* Literal */ .chroma .l {  }
+/* LiteralDate */ .chroma .ld {  }
+/* LiteralString */ .chroma .s { color: #f1fa8c }
+/* LiteralStringAffix */ .chroma .sa { color: #f1fa8c }
+/* LiteralStringBacktick */ .chroma .sb { color: #f1fa8c }
+/* LiteralStringChar */ .chroma .sc { color: #f1fa8c }
+/* LiteralStringDelimiter */ .chroma .dl { color: #f1fa8c }
+/* LiteralStringDoc */ .chroma .sd { color: #f1fa8c }
+/* LiteralStringDouble */ .chroma .s2 { color: #f1fa8c }
+/* LiteralStringEscape */ .chroma .se { color: #f1fa8c }
+/* LiteralStringHeredoc */ .chroma .sh { color: #f1fa8c }
+/* LiteralStringInterpol */ .chroma .si { color: #f1fa8c }
+/* LiteralStringOther */ .chroma .sx { color: #f1fa8c }
+/* LiteralStringRegex */ .chroma .sr { color: #f1fa8c }
+/* LiteralStringSingle */ .chroma .s1 { color: #f1fa8c }
+/* LiteralStringSymbol */ .chroma .ss { color: #f1fa8c }
+/* LiteralNumber */ .chroma .m { color: #bd93f9 }
+/* LiteralNumberBin */ .chroma .mb { color: #bd93f9 }
+/* LiteralNumberFloat */ .chroma .mf { color: #bd93f9 }
+/* LiteralNumberHex */ .chroma .mh { color: #bd93f9 }
+/* LiteralNumberInteger */ .chroma .mi { color: #bd93f9 }
+/* LiteralNumberIntegerLong */ .chroma .il { color: #bd93f9 }
+/* LiteralNumberOct */ .chroma .mo { color: #bd93f9 }
+/* Operator */ .chroma .o { color: #ff79c6 }
+/* OperatorWord */ .chroma .ow { color: #ff79c6 }
+/* Punctuation */ .chroma .p {  }
+/* Comment */ .chroma .c { color: #6272a4 }
+/* CommentHashbang */ .chroma .ch { color: #6272a4 }
+/* CommentMultiline */ .chroma .cm { color: #6272a4 }
+/* CommentSingle */ .chroma .c1 { color: #6272a4 }
+/* CommentSpecial */ .chroma .cs { color: #6272a4 }
+/* CommentPreproc */ .chroma .cp { color: #ff79c6 }
+/* CommentPreprocFile */ .chroma .cpf { color: #ff79c6 }
+/* Generic */ .chroma .g {  }
+/* GenericDeleted */ .chroma .gd { color: #ff5555 }
+/* GenericEmph */ .chroma .ge { text-decoration: underline }
+/* GenericError */ .chroma .gr {  }
+/* GenericHeading */ .chroma .gh { font-weight: bold }
+/* GenericInserted */ .chroma .gi { color: #50fa7b; font-weight: bold }
+/* GenericOutput */ .chroma .go { color: #44475a }
+/* GenericPrompt */ .chroma .gp {  }
+/* GenericStrong */ .chroma .gs {  }
+/* GenericSubheading */ .chroma .gu { font-weight: bold }
+/* GenericTraceback */ .chroma .gt {  }
+/* GenericUnderline */ .chroma .gl { text-decoration: underline }
+/* TextWhitespace */ .chroma .w {  }
diff --git a/themes/alejandro-angulo/static/css/style.css b/themes/alejandro-angulo/static/css/style.css
new file mode 100644
index 0000000..c527c60
--- /dev/null
+++ b/themes/alejandro-angulo/static/css/style.css
@@ -0,0 +1,72 @@
+body {
+    background-color: #1d2021;
+    color: #ffffdf;
+	margin: 1em;
+}
+
+a {
+    color: #00a7af;
+}
+a:visited {
+    color: #005f87;
+}
+a:hover {
+	background-color: #00a7af;
+	color: #1d2021;
+}
+
+#header-link {
+    text-decoration: none;
+}
+
+#content {
+    margin-bottom: 2em;
+}
+
+#site-footer {
+    background-color: #3a3a3a;
+    bottom: 0;
+    left: 0;
+    margin: 0;
+	padding: 3px 0;
+    position: fixed;
+    width: 100%;
+}
+
+#site-footer .current-page {
+    color: #ffaf00;
+	padding: 0 5px;
+}
+
+#nav {
+    display: inline-block;
+}
+
+.lhs {
+    float: left;
+}
+
+.rhs {
+    float: right;
+}
+
+.home-link,
+.nav-link {
+	text-decoration: none;
+	padding: 0 5px;
+}
+.nav-link,
+.nav-link:visited,
+.home-link,
+.home-link:visited {
+    color: #949494;
+}
+.nav-link:hover,
+.home-link:hover {
+    color: inherit;
+    background-color: inherit;
+}
+
+.highlight .chroma {
+	padding: 1em;
+}
diff --git a/themes/alejandro-angulo/theme.toml b/themes/alejandro-angulo/theme.toml
new file mode 100644
index 0000000..46d637d
--- /dev/null
+++ b/themes/alejandro-angulo/theme.toml
@@ -0,0 +1,7 @@
+name = "alejandro-angulo"
+license = "MIT"
+min_version = "0.41.0"
+
+[author]
+  name = "Alejandro Angulo"
+  homepage = "https://alejandr0angul0.dev/"
diff --git a/themes/terminal b/themes/terminal
deleted file mode 160000
index 6404a48..0000000
--- a/themes/terminal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6404a48fe385a70a8ca22e9da72839c9709665de