formatting: Use clang-format on all projects

This commit also add braces to all `if` statements.

144 files changed, 833 insertions, 586 deletions

diff --git a/.clang-format b/.clang-format
index 1736667..6b9efa2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,2 +1,3 @@
 BasedOnStyle: llvm
 AllowShortFunctionsOnASingleLine: None
+InsertBraces: True
diff --git a/kernel/drivers/ac97.c b/kernel/drivers/ac97.c
index b88a32a..27711ff 100644
--- a/kernel/drivers/ac97.c
+++ b/kernel/drivers/ac97.c
@@ -213,7 +213,7 @@ void ac97_init(void) {
   PCM Output by writing value 0 to this register. Now sound card is
   ready to use.
   */
-  ac97_set_volume(100);
+  ac97_set_volume(5);
 
   // Playing sound
   /*
diff --git a/kernel/drivers/ac97.h b/kernel/drivers/ac97.h
index f1089e5..20ac43b 100644
--- a/kernel/drivers/ac97.h
+++ b/kernel/drivers/ac97.h
@@ -1,8 +1,8 @@
-#include <typedefs.h>
 #include <stddef.h>
+#include <typedefs.h>
 
 void ac97_init(void);
-int ac97_add_pcm(u8* buffer, size_t len);
+int ac97_add_pcm(u8 *buffer, size_t len);
 int ac97_can_write(void);
 void ac97_set_volume(int volume);
 int ac97_get_volume(void);
diff --git a/kernel/drivers/mouse.c b/kernel/drivers/mouse.c
index 47133b8..dea8c08 100644
--- a/kernel/drivers/mouse.c
+++ b/kernel/drivers/mouse.c
@@ -102,18 +102,22 @@ void int_mouse(reg_t *r) {
     int16_t y = mouse_u8[2];
     uint8_t xs = mouse_u8[0] & (1 << 4);
     uint8_t ys = mouse_u8[0] & (1 << 5);
-    if (xs)
+    if (xs) {
       x |= 0xFF00;
-    if (ys)
+    }
+    if (ys) {
       y |= 0xFF00;
+    }
 
     mouse_x += x;
     mouse_y -= y;
 
-    if (mouse_x < 0)
+    if (mouse_x < 0) {
       mouse_x = 0;
-    if (mouse_y < 0)
+    }
+    if (mouse_y < 0) {
       mouse_y = 0;
+    }
 
     mouse_middle_button = mouse_u8[0] & (1 << 2);
     mouse_right_button = mouse_u8[0] & (1 << 1);
diff --git a/kernel/fs/devfs.h b/kernel/fs/devfs.h
index 09bf4d6..09c60d0 100644
--- a/kernel/fs/devfs.h
+++ b/kernel/fs/devfs.h
@@ -22,7 +22,6 @@ vfs_inode_t *devfs_add_file(
     int (*has_data)(vfs_inode_t *inode), int (*can_write)(vfs_inode_t *inode),
     int type);
 
-
 int always_has_data(vfs_inode_t *inode);
 int always_can_write(vfs_inode_t *inode);
 #endif
diff --git a/kernel/includes/math.h b/kernel/includes/math.h
index 87a9d37..8fb698d 100644
--- a/kernel/includes/math.h
+++ b/kernel/includes/math.h
@@ -1,3 +1,3 @@
-#define min(a,b) ((a) > (b) ? (b) : (a))
-#define max(a,b) ((a) < (b) ? (b) : (a))
-#define abs(a) ((a)>0?(a):(-1*(a)))
+#define min(a, b) ((a) > (b) ? (b) : (a))
+#define max(a, b) ((a) < (b) ? (b) : (a))
+#define abs(a) ((a) > 0 ? (a) : (-1 * (a)))
diff --git a/kernel/includes/mmu.h b/kernel/includes/mmu.h
index 580b40e..20cd2ae 100644
--- a/kernel/includes/mmu.h
+++ b/kernel/includes/mmu.h
@@ -49,7 +49,7 @@ void mmu_free_address_range(void *ptr, size_t length, PageDirectory *pd);
 u32 mmu_get_number_of_allocated_frames(void);
 void *mmu_map_frames(void *ptr, size_t s);
 int mmu_map_physical(void *dst, PageDirectory *d, void *physical,
-                      size_t length);
+                     size_t length);
 void mmu_free_pages(void *a, u32 n);
 void *mmu_map_user_frames(void *const ptr, size_t s);
 void *mmu_is_valid_userpointer(const void *ptr, size_t s);
diff --git a/kernel/lib/sb.c b/kernel/lib/sb.c
index 3f99d95..6f716ac 100644
--- a/kernel/lib/sb.c
+++ b/kernel/lib/sb.c
@@ -1,8 +1,8 @@
 #include <kmalloc.h>
+#include <lib/sb.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include <tb/sb.h>
 
 #define DEFAULT_CAPACITY 256
 
diff --git a/kernel/lib/sb.h b/kernel/lib/sb.h
index 8493997..7832015 100644
--- a/kernel/lib/sb.h
+++ b/kernel/lib/sb.h
@@ -22,8 +22,7 @@ int sb_isempty(const struct sb *ctx);
 int sb_append_char(struct sb *ctx, char c);
 int sb_delete_right(struct sb *ctx, size_t n);
 int sb_append(struct sb *ctx, const char *s);
-int sb_append_buffer(struct sb *ctx, const char *buffer,
-                      size_t length);
+int sb_append_buffer(struct sb *ctx, const char *buffer, size_t length);
 int sb_append_sv(struct sb *ctx, struct sv sv);
 int sb_prepend_sv(struct sb *ctx, struct sv sv);
 int sb_prepend_buffer(struct sb *ctx, const char *buffer, size_t length);
diff --git a/kernel/lib/sv.h b/kernel/lib/sv.h
index bd556d4..40f33ca 100644
--- a/kernel/lib/sv.h
+++ b/kernel/lib/sv.h
@@ -40,5 +40,6 @@ struct sv sv_trim_left(struct sv s, size_t n);
 struct sv sv_clone(struct sv s);
 struct sv sv_clone_from_c(const char *s);
 char *sv_copy_to_c(struct sv s, char *out, size_t buffer_length);
-uint64_t sv_parse_unsigned_number(struct sv input, struct sv *rest, int *got_num);
+uint64_t sv_parse_unsigned_number(struct sv input, struct sv *rest,
+                                  int *got_num);
 #endif
diff --git a/kernel/libc/ctype/tolower.c b/kernel/libc/ctype/tolower.c
index f1bb163..c14ea54 100644
--- a/kernel/libc/ctype/tolower.c
+++ b/kernel/libc/ctype/tolower.c
@@ -1,7 +1,8 @@
 #include <ctype.h>
 
 int tolower(int c) {
-  if (c >= 'A' && c <= 'Z')
+  if (c >= 'A' && c <= 'Z') {
     return c - 'A' + 'a';
+  }
   return c;
 }
diff --git a/kernel/libc/include/assert.h b/kernel/libc/include/assert.h
index d6525f0..1b631ac 100644
--- a/kernel/libc/include/assert.h
+++ b/kernel/libc/include/assert.h
@@ -21,5 +21,4 @@
   }
 
 void aFailed(char *f, int l);
-#define ASSERT_NOT_REACHED                                                     \
-  { assert(0) }
+#define ASSERT_NOT_REACHED {assert(0)}
diff --git a/kernel/network/udp.h b/kernel/network/udp.h
index af532ec..06f65d1 100644
--- a/kernel/network/udp.h
+++ b/kernel/network/udp.h
@@ -1,6 +1,7 @@
 #include <socket.h>
 #include <typedefs.h>
 
-void handle_udp(ipv4_t src_ip, ipv4_t dst_ip, const u8 *payload, u32 packet_length);
+void handle_udp(ipv4_t src_ip, ipv4_t dst_ip, const u8 *payload,
+                u32 packet_length);
 void send_udp_packet(struct sockaddr_in *src, const struct sockaddr_in *dst,
                      const u8 *payload, u16 payload_length);
diff --git a/meta/run.sh b/meta/run.sh
index ae70780..f5f5d9f 100755
--- a/meta/run.sh
+++ b/meta/run.sh
@@ -2,10 +2,23 @@
 scriptdir="$(dirname "$0")"
 cd "$scriptdir"
 cd ..
-qemu-system-i386 -enable-kvm -machine kernel_irqchip=off -netdev user,id=n0,hostfwd=tcp:127.0.0.1:6001-:6000 -device rtl8139,netdev=n0 -object filter-dump,id=id,netdev=n0,file=./logs/netout -no-reboot -no-shutdown -chardev stdio,id=char0,logfile=./logs/serial.log,signal=off -serial chardev:char0 -drive id=disk,file=./meta/ext2.img,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -m 256M -cdrom ./kernel/myos.iso -d int -s # 2> interrupts
+#qemu-system-i386 -enable-kvm \
+#~/rg/qemu-9.0.1/build/qemu-system-i386 -display sdl -enable-kvm \
+#	-device virtio-net-pci,netdev=n0,mac=00:00:11:11:11:11 \
+#~/rg/qemu/build/qemu-system-i386 -d int -display sdl \
+~/rg/qemu/build/qemu-system-i386 -enable-kvm -display sdl \
+	-netdev user,id=n0,hostfwd=tcp:127.0.0.1:6001-:80,hostfwd=tcp:127.0.0.1:6000-:22\
+	-object filter-dump,maxlen=1024000,id=id,netdev=n0,file=./logs/netout\
+	-no-reboot -no-shutdown\
+	-device rtl8139,netdev=n0\
+	-chardev stdio,id=char0,logfile=./logs/serial.log,signal=off\
+	-serial chardev:char0 -drive id=disk,file=./meta/ext2.img,if=none\
+	-device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0\
+	-audio driver=sdl,model=ac97,id=0\
+	-m 2G -cdrom ./kernel/myos.iso -s # 2> interrupts
 # Sync the sysroot
 cd ./meta/
 mkdir ./mount
 sudo mount ./ext2.img ./mount
-sudo cp -r ./mount/* ../sysroot/
+sudo rsync ./mount/ ../sysroot/
 sudo umount ./ext2.img
diff --git a/meta/sync.sh b/meta/sync.sh
index ab56757..9bbf2b1 100755
--- a/meta/sync.sh
+++ b/meta/sync.sh
@@ -7,6 +7,6 @@ cd "$scriptdir"
 # Sync the sysroot with the bootable image
 mkdir ./mount
 sudo mount ext2.img mount
-sudo cp -r ../sysroot/* ./mount/
+sudo rsync ../sysroot/ ./mount/
 sudo umount mount
 rmdir ./mount
diff --git a/meta/userland.sh b/meta/userland.sh
index 2307f02..b38ae4a 100755
--- a/meta/userland.sh
+++ b/meta/userland.sh
@@ -59,4 +59,5 @@ ln -s ./minibox ./rdate
 ln -s ./minibox ./sh
 ln -s ./minibox ./true
 ln -s ./minibox ./false
+ln -s ./minibox ./lock
 cd ..
diff --git a/userland/httpd/Makefile b/userland/httpd/Makefile
index cc9eb16..aba71dc 100644
--- a/userland/httpd/Makefile
+++ b/userland/httpd/Makefile
@@ -4,6 +4,7 @@ BINS=httpd
 all: $(BINS)
 
 httpd.o: httpd.c
+	clang-format -i $<
 	$(CC) $(CFLAGS) -o $@ -c $<
 
 httpd: httpd.o
diff --git a/userland/irc/Makefile b/userland/irc/Makefile
index c5f0c3d..835a7ee 100644
--- a/userland/irc/Makefile
+++ b/userland/irc/Makefile
@@ -2,20 +2,16 @@ CC="i686-sb-gcc"
 CFLAGS = -ggdb -O2 -Wall -Wextra -Werror -Wno-pointer-sign -Wno-int-conversion -static
 LIB=-L../libgui -lgui
 INC=-I../libgui
+OBJS=sb.o sv.o irc.o
 BINS=irc
 all: $(BINS)
 
-sb.o: sb.c
+%.o: %.c
+	clang-format -i $<
 	$(CC) $(CFLAGS) $(INC) $(LIB) -o $@ -c $<
 
-sv.o: sv.c
-	$(CC) $(CFLAGS) $(INC) $(LIB) -o $@ -c $<
-
-irc.o: irc.c
-	$(CC) $(CFLAGS) $(INC) $(LIB) -o $@ -c $<
-
-irc: irc.o sb.o sv.o
+irc: $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $^ $(LIB)
 
 clean:
-	rm $(BINS) *.o
+	rm $(BINS) $(OBJS)
diff --git a/userland/irc/sv.c b/userland/irc/sv.c
index c29d082..76d48d6 100644
--- a/userland/irc/sv.c
+++ b/userland/irc/sv.c
@@ -1,7 +1,7 @@
 #include "sv.h"
+#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 char *SV_TO_C(struct sv s) {
   char *c_string = malloc(s.length + 1);
diff --git a/userland/libc/Makefile b/userland/libc/Makefile
index e5aeff1..19dabe6 100644
--- a/userland/libc/Makefile
+++ b/userland/libc/Makefile
@@ -6,6 +6,7 @@ OBJ=crt0.o libc.o malloc/malloc.o pty.o sys/mman/mmap.o sys/mman/munmap.o memset
 all: libc.a
 
 %.o: %.c
+	clang-format -i $<
 	$(CC) $(CFLAGS) -I. -o $@ -c $<
 
 %.o: %.s
diff --git a/userland/libc/arpa/inet/ntohl.c b/userland/libc/arpa/inet/ntohl.c
index 456819d..4cf3d8c 100644
--- a/userland/libc/arpa/inet/ntohl.c
+++ b/userland/libc/arpa/inet/ntohl.c
@@ -2,4 +2,6 @@
 #include <endian.h>
 #include <stdint.h>
 
-uint32_t ntohl(uint32_t nl) { return htonl(nl); }
+uint32_t ntohl(uint32_t nl) {
+  return htonl(nl);
+}
diff --git a/userland/libc/arpa/inet/ntohs.c b/userland/libc/arpa/inet/ntohs.c
index e0324ff..0a97b50 100644
--- a/userland/libc/arpa/inet/ntohs.c
+++ b/userland/libc/arpa/inet/ntohs.c
@@ -3,5 +3,5 @@
 #include <stdint.h>
 
 uint16_t ntohs(uint16_t nl) {
-	return htons(nl);
+  return htons(nl);
 }
diff --git a/userland/libc/ctype/isalnum.c b/userland/libc/ctype/isalnum.c
index 870728d..073b8bb 100644
--- a/userland/libc/ctype/isalnum.c
+++ b/userland/libc/ctype/isalnum.c
@@ -2,5 +2,5 @@
 
 // This is probably the most useless libc function I have seen so far.
 int isalnum(int c) {
-	return isalpha(c) || isdigit(c);
+  return isalpha(c) || isdigit(c);
 }
diff --git a/userland/libc/ctype/isalpha.c b/userland/libc/ctype/isalpha.c
index 130f493..38c3cb4 100644
--- a/userland/libc/ctype/isalpha.c
+++ b/userland/libc/ctype/isalpha.c
@@ -1,4 +1,6 @@
 #include <ctype.h>
 
 // https://pubs.opengroup.org/onlinepubs/9699919799/functions/isalpha.html
-int isalpha(int c) { return (('A' <= toupper(c)) && ('Z' >= toupper(c))); }
+int isalpha(int c) {
+  return (('A' <= toupper(c)) && ('Z' >= toupper(c)));
+}
diff --git a/userland/libc/ctype/isascii.c b/userland/libc/ctype/isascii.c
index 660c8bb..b598dde 100644
--- a/userland/libc/ctype/isascii.c
+++ b/userland/libc/ctype/isascii.c
@@ -1,4 +1,6 @@
 #include <ctype.h>
 
 // https://pubs.opengroup.org/onlinepubs/9699919799/functions/isascii.html
-int isascii(int c) { return (c < 128); }
+int isascii(int c) {
+  return (c < 128);
+}
diff --git a/userland/libc/ctype/isblank.c b/userland/libc/ctype/isblank.c
index 488fa88..88ffa0b 100644
--- a/userland/libc/ctype/isblank.c
+++ b/userland/libc/ctype/isblank.c
@@ -1,5 +1,5 @@
 #include <ctype.h>
 
 int isblank(int c) {
-	return (c == ' ' || c == '\t');
+  return (c == ' ' || c == '\t');
 }
diff --git a/userland/libc/ctype/iscntrl.c b/userland/libc/ctype/iscntrl.c
index 92ed7f0..4fead0d 100644
--- a/userland/libc/ctype/iscntrl.c
+++ b/userland/libc/ctype/iscntrl.c
@@ -1,6 +1,5 @@
 #include <ctype.h>
 
-int iscntrl(int c)
-{
-	return (unsigned)c < 0x20 || c == 0x7f;
+int iscntrl(int c) {
+  return (unsigned)c < 0x20 || c == 0x7f;
 }
diff --git a/userland/libc/ctype/isprint.c b/userland/libc/ctype/isprint.c
index e6a3d0e..5504ebc 100644
--- a/userland/libc/ctype/isprint.c
+++ b/userland/libc/ctype/isprint.c
@@ -1,3 +1,5 @@
 #include <ctype.h>
 
-int isprint(int c) { return c > 0x20 && 0x7F != c; }
+int isprint(int c) {
+  return c > 0x20 && 0x7F != c;
+}
diff --git a/userland/libc/ctype/ispunct.c b/userland/libc/ctype/ispunct.c
index 18dc7d8..abef66d 100644
--- a/userland/libc/ctype/ispunct.c
+++ b/userland/libc/ctype/ispunct.c
@@ -2,5 +2,5 @@
 
 // https://pubs.opengroup.org/onlinepubs/9699919799/functions/ispunct.html
 int ispunct(int c) {
-	return (c == '.');
+  return (c == '.');
 }
diff --git a/userland/libc/ctype/tolower.c b/userland/libc/ctype/tolower.c
index f1bb163..c14ea54 100644
--- a/userland/libc/ctype/tolower.c
+++ b/userland/libc/ctype/tolower.c
@@ -1,7 +1,8 @@
 #include <ctype.h>
 
 int tolower(int c) {
-  if (c >= 'A' && c <= 'Z')
+  if (c >= 'A' && c <= 'Z') {
     return c - 'A' + 'a';
+  }
   return c;
 }
diff --git a/userland/libc/ctype/toupper.c b/userland/libc/ctype/toupper.c
index 0f33886..599a0ff 100644
--- a/userland/libc/ctype/toupper.c
+++ b/userland/libc/ctype/toupper.c
@@ -1,7 +1,8 @@
 #include <ctype.h>
 
 int toupper(int c) {
-  if (c >= 'a' && c <= 'z')
+  if (c >= 'a' && c <= 'z') {
     return c - 'a' + 'A';
+  }
   return c;
 }
diff --git a/userland/libc/dirent/readdir.c b/userland/libc/dirent/readdir.c
index 9a9f8fa..a7f0d66 100644
--- a/userland/libc/dirent/readdir.c
+++ b/userland/libc/dirent/readdir.c
@@ -18,10 +18,12 @@ struct dirent *readdir(DIR *dir) {
   size_t offset = dir->dir_num * sizeof(struct dirent);
   int rc;
   if (-1 == (rc = pread(dir->fd, &dir->internal_direntry, sizeof(struct dirent),
-                        offset)))
+                        offset))) {
     return NULL;
-  if (rc < (int)sizeof(struct dirent))
+  }
+  if (rc < (int)sizeof(struct dirent)) {
     return NULL;
+  }
 
   dir->dir_num++;
   return &(dir->internal_direntry);
diff --git a/userland/libc/dirent/scandir.c b/userland/libc/dirent/scandir.c
index 3ac040a..11f23a9 100644
--- a/userland/libc/dirent/scandir.c
+++ b/userland/libc/dirent/scandir.c
@@ -70,12 +70,14 @@ void scandir_sane_free(struct dirent **namelist) {
 int scandir(const char *dir, struct dirent ***namelist,
             int (*sel)(const struct dirent *),
             int (*compar)(const struct dirent **, const struct dirent **)) {
-  if (!compar)
+  if (!compar) {
     compar = nop_compar;
+  }
 
   DIR *d = opendir(dir);
-  if (!d)
+  if (!d) {
     return -1;
+  }
   struct dirent **list = NULL;
   struct dirent *e;
   int rc = 0;
diff --git a/userland/libc/fcntl/open.c b/userland/libc/fcntl/open.c
index 357d826..1e8781a 100644
--- a/userland/libc/fcntl/open.c
+++ b/userland/libc/fcntl/open.c
@@ -1,6 +1,6 @@
 #include <fcntl.h>
-#include <syscall.h>
 #include <stdarg.h>
+#include <syscall.h>
 
 int open(const char *file, int flags, ...) {
   mode_t mode = 0;
diff --git a/userland/libc/include/assert.h b/userland/libc/include/assert.h
index a009e5f..c35845e 100644
--- a/userland/libc/include/assert.h
+++ b/userland/libc/include/assert.h
@@ -1,10 +1,10 @@
 #ifndef ASSERT_H
 #define ASSERT_H
 
-#define assert(expr)                                                            \
+#define assert(expr)                                                           \
   {                                                                            \
     if (!(expr))                                                               \
-      aFailed(__FILE__, __LINE__);                                              \
+      aFailed(__FILE__, __LINE__);                                             \
   }
 void aFailed(char *f, int l);
 #endif
diff --git a/userland/libc/include/math.h b/userland/libc/include/math.h
index 7168a5d..3590caa 100644
--- a/userland/libc/include/math.h
+++ b/userland/libc/include/math.h
@@ -1,16 +1,16 @@
 #define max(_a, _b) ((_a) > (_b) ? (_a) : (_b))
 #define min(_a, _b) ((_a) < (_b) ? (_a) : (_b))
 
-#if 100*__GNUC__+__GNUC_MINOR__ >= 303
-#define NAN       __builtin_nanf("")
-#define INFINITY  __builtin_inff()
+#if 100 * __GNUC__ + __GNUC_MINOR__ >= 303
+#define NAN __builtin_nanf("")
+#define INFINITY __builtin_inff()
 #else
-#define NAN       (0.0f/0.0f)
-#define INFINITY  1e40f
+#define NAN (0.0f / 0.0f)
+#define INFINITY 1e40f
 #endif
 
 #define HUGE_VALF INFINITY
-#define HUGE_VAL  ((double)INFINITY)
+#define HUGE_VAL ((double)INFINITY)
 #define HUGE_VALL ((long double)INFINITY)
 
 double ldexp(double x, int exp);
diff --git a/userland/libc/include/pty.h b/userland/libc/include/pty.h
index b8ce978..e5de5a3 100644
--- a/userland/libc/include/pty.h
+++ b/userland/libc/include/pty.h
@@ -1,6 +1,6 @@
 #ifndef PTY_H
 #define PTY_H
 int openpty(int *amaster, int *aslave, char *name,
-                    /*const struct termios*/ void *termp,
-                    /*const struct winsize*/ void *winp);
+            /*const struct termios*/ void *termp,
+            /*const struct winsize*/ void *winp);
 #endif
diff --git a/userland/libc/include/setjmp.h b/userland/libc/include/setjmp.h
index ea15cf3..ec7e23c 100644
--- a/userland/libc/include/setjmp.h
+++ b/userland/libc/include/setjmp.h
@@ -2,9 +2,9 @@
 #define SETJMP_H
 typedef unsigned long __jmp_buf[6];
 typedef struct __jmp_buf_tag {
-	__jmp_buf __jb;
-	unsigned long __fl;
-	unsigned long __ss[128/sizeof(long)];
+  __jmp_buf __jb;
+  unsigned long __fl;
+  unsigned long __ss[128 / sizeof(long)];
 } jmp_buf[1];
 typedef jmp_buf sigjmp_buf;
 
diff --git a/userland/libc/include/sys/sendfile.h b/userland/libc/include/sys/sendfile.h
index 5e83999..6fdd21b 100644
--- a/userland/libc/include/sys/sendfile.h
+++ b/userland/libc/include/sys/sendfile.h
@@ -1,7 +1,6 @@
-#include <stdint.h>
-#include <typedefs.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <sys/types.h>
+#include <typedefs.h>
 
-u32 sendfile(int out_fd, int in_fd, off_t *offset, size_t count,
-             int *error_rc);
+u32 sendfile(int out_fd, int in_fd, off_t *offset, size_t count, int *error_rc);
diff --git a/userland/libc/include/tb/sb.h b/userland/libc/include/tb/sb.h
index 8493997..7832015 100644
--- a/userland/libc/include/tb/sb.h
+++ b/userland/libc/include/tb/sb.h
@@ -22,8 +22,7 @@ int sb_isempty(const struct sb *ctx);
 int sb_append_char(struct sb *ctx, char c);
 int sb_delete_right(struct sb *ctx, size_t n);
 int sb_append(struct sb *ctx, const char *s);
-int sb_append_buffer(struct sb *ctx, const char *buffer,
-                      size_t length);
+int sb_append_buffer(struct sb *ctx, const char *buffer, size_t length);
 int sb_append_sv(struct sb *ctx, struct sv sv);
 int sb_prepend_sv(struct sb *ctx, struct sv sv);
 int sb_prepend_buffer(struct sb *ctx, const char *buffer, size_t length);
diff --git a/userland/libc/isspace.c b/userland/libc/isspace.c
index 9ba2766..a922d91 100644
--- a/userland/libc/isspace.c
+++ b/userland/libc/isspace.c
@@ -1,5 +1,5 @@
 #include <ctype.h>
 
 int isspace(int c) {
-    return c == ' ' || (unsigned)c-'\t' < 5;
+  return c == ' ' || (unsigned)c - '\t' < 5;
 }
diff --git a/userland/libc/libgen/basename.c b/userland/libc/libgen/basename.c
index a0a8adb..64a533d 100644
--- a/userland/libc/libgen/basename.c
+++ b/userland/libc/libgen/basename.c
@@ -19,18 +19,21 @@ char *basename_slash_return_value = "/";
 char *basename(char *path) {
   // If path is a null pointer or points to an empty string, basename()
   // shall return a pointer to the string ".".
-  if (NULL == path || '\0' == *path)
+  if (NULL == path || '\0' == *path) {
     return basename_empty_return_value;
+  }
 
   char *start = path;
   // Move the string to the end
   for (; *path; path++)
     ;
-  if (start == path)
+  if (start == path) {
     return start;
+  }
   path--;
-  if ('/' == *path) // Trailing slash
+  if ('/' == *path) { // Trailing slash
     *path = '\0';
+  }
   // Loop until next slash is found
   for (; path != start && '/' != *path; path--)
     ;
@@ -39,7 +42,8 @@ char *basename(char *path) {
   // pointed to by path is exactly "//", it is implementation-defined whether
   //'/' or "//" is returned.
   path++;
-  if ('\0' == *path)
+  if ('\0' == *path) {
     return basename_slash_return_value;
+  }
   return path;
 }
diff --git a/userland/libc/libgen/dirname.c b/userland/libc/libgen/dirname.c
index fb3c813..feaf784 100644
--- a/userland/libc/libgen/dirname.c
+++ b/userland/libc/libgen/dirname.c
@@ -5,18 +5,21 @@ char *dirname_slash_return_value = "/";
 char *dirname(char *path) {
   // If path is a null pointer or points to an empty string,
   // dirname() shall return a pointer to the string "."
-  if (!path)
+  if (!path) {
     return dirname_empty_return_value;
-  if ('\0' == *path)
+  }
+  if ('\0' == *path) {
     return dirname_empty_return_value;
+  }
 
   char *start = path;
   for (; *path; path++)
     ;
   path--;
   if ('/' == *path) {
-    if (start == path)
+    if (start == path) {
       return path;
+    }
     path--;
   }
 
@@ -24,11 +27,13 @@ char *dirname(char *path) {
     ;
   // If path does not contain a '/', then dirname() shall return a pointer to
   // the string ".".
-  if ('/' != *path)
+  if ('/' != *path) {
     return dirname_empty_return_value;
+  }
 
-  if (path == start)
+  if (path == start) {
     return dirname_slash_return_value;
+  }
 
   *path = '\0';
   path--;
@@ -36,8 +41,9 @@ char *dirname(char *path) {
   for (; path != start && '/' != *path; path--)
     ;
 
-  if ('/' != *path)
+  if ('/' != *path) {
     return dirname_empty_return_value;
+  }
 
   path++;
   return path;
diff --git a/userland/libc/malloc/malloc.h b/userland/libc/malloc/malloc.h
index 596dbe5..d6a6ab7 100644
--- a/userland/libc/malloc/malloc.h
+++ b/userland/libc/malloc/malloc.h
@@ -1,7 +1,7 @@
 #ifndef MALLOC_H
 #define MALLOC_H
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 void *malloc(size_t s);
 void *calloc(size_t nelem, size_t elsize);
diff --git a/userland/libc/memset.c b/userland/libc/memset.c
index 51910e9..6baa3ca 100644
--- a/userland/libc/memset.c
+++ b/userland/libc/memset.c
@@ -7,8 +7,9 @@ void *memset(void *s, int c, size_t n) {
   // s.
 
   unsigned char *p = s;
-  for (; n > 0; n--, p++)
+  for (; n > 0; n--, p++) {
     *p = (unsigned char)c;
+  }
 
   // The memset() function shall return s
   return s;
diff --git a/userland/libc/pty.c b/userland/libc/pty.c
index 17b91de..d64e212 100644
--- a/userland/libc/pty.c
+++ b/userland/libc/pty.c
@@ -2,14 +2,14 @@
 #include "syscall.h"
 
 int openpty(int *amaster, int *aslave, char *name,
-                    /*const struct termios*/ void *termp,
-                    /*const struct winsize*/ void *winp) {
- SYS_OPENPTY_PARAMS args = {
-    .amaster = amaster,
-    .aslave = aslave,
-    .name = name,
-    .termp = termp,
-    .winp = winp,
- };
- return syscall(SYS_OPENPTY, &args, 0, 0, 0, 0);
+            /*const struct termios*/ void *termp,
+            /*const struct winsize*/ void *winp) {
+  SYS_OPENPTY_PARAMS args = {
+      .amaster = amaster,
+      .aslave = aslave,
+      .name = name,
+      .termp = termp,
+      .winp = winp,
+  };
+  return syscall(SYS_OPENPTY, &args, 0, 0, 0, 0);
 }
diff --git a/userland/libc/signal/sigaction.c b/userland/libc/signal/sigaction.c
index 1ff22a7..97ba6ed 100644
--- a/userland/libc/signal/sigaction.c
+++ b/userland/libc/signal/sigaction.c
@@ -1,7 +1,6 @@
 #include <signal.h>
 #include <syscall.h>
 
-int sigaction(int sig, const struct sigaction *act,
-              struct sigaction *oact) {
-  RC_ERRNO(syscall(SYS_SIGACTION, sig, act, oact, 0,0))
+int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) {
+  RC_ERRNO(syscall(SYS_SIGACTION, sig, act, oact, 0, 0))
 }
diff --git a/userland/libc/stdio/feof.c b/userland/libc/stdio/feof.c
index 7f46301..91e7e56 100644
--- a/userland/libc/stdio/feof.c
+++ b/userland/libc/stdio/feof.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
 
 int feof(FILE *stream) {
-    return stream->is_eof;
+  return stream->is_eof;
 }
diff --git a/userland/libc/stdio/ferror.c b/userland/libc/stdio/ferror.c
index 8cb46cf..5049db8 100644
--- a/userland/libc/stdio/ferror.c
+++ b/userland/libc/stdio/ferror.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
 
 int ferror(FILE *stream) {
-    return stream->has_error;
+  return stream->has_error;
 }
diff --git a/userland/libc/stdio/fflush.c b/userland/libc/stdio/fflush.c
index 1cadc72..8bfd16d 100644
--- a/userland/libc/stdio/fflush.c
+++ b/userland/libc/stdio/fflush.c
@@ -1,6 +1,6 @@
+#include <errno.h>
 #include <stdio.h>
 #include <syscall.h>
-#include <errno.h>
 
 // https://pubs.opengroup.org/onlinepubs/9699919799/functions/fflush.html
 int fflush(FILE *stream) {
diff --git a/userland/libc/stdio/fgetc.c b/userland/libc/stdio/fgetc.c
index afa299f..dc7af77 100644
--- a/userland/libc/stdio/fgetc.c
+++ b/userland/libc/stdio/fgetc.c
@@ -8,13 +8,16 @@ int fgetc(FILE *stream) {
     return stream->buffered_char;
   }
   char c;
-  if (1 == fread(&c, 1, 1, stream))
+  if (1 == fread(&c, 1, 1, stream)) {
     return (int)c;
+  }
   // FIXME: Should use feof and ferror
-  if (stream->has_error)
+  if (stream->has_error) {
     return EOF;
-  if (stream->is_eof)
+  }
+  if (stream->is_eof) {
     return EOF;
+  }
   // How did we get here?
   assert(0);
   return EOF;
diff --git a/userland/libc/stdio/fgets.c b/userland/libc/stdio/fgets.c
index 8e21501..acc89a0 100644
--- a/userland/libc/stdio/fgets.c
+++ b/userland/libc/stdio/fgets.c
@@ -4,13 +4,16 @@ char *fgets(char *s, int n, FILE *stream) {
   for (int i = 0; i < n; i++) {
     char c;
     fread(&c, 1, 1, stream);
-    if (stream->has_error)
+    if (stream->has_error) {
       return NULL;
-    if (stream->is_eof)
+    }
+    if (stream->is_eof) {
       return NULL;
+    }
     s[i] = c;
-    if (c == '\n')
+    if (c == '\n') {
       break;
+    }
   }
   return s;
 }
diff --git a/userland/libc/stdio/fileno.c b/userland/libc/stdio/fileno.c
index 246cc51..bdf9332 100644
--- a/userland/libc/stdio/fileno.c
+++ b/userland/libc/stdio/fileno.c
@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
 
 // https://pubs.opengroup.org/onlinepubs/9699919799/functions/fileno.html
 // The fileno() function shall return the integer file descriptor associated
diff --git a/userland/libc/stdio/fputc.c b/userland/libc/stdio/fputc.c
index 7c8fa7c..c41ffa4 100644
--- a/userland/libc/stdio/fputc.c
+++ b/userland/libc/stdio/fputc.c
@@ -1,7 +1,8 @@
 #include <stdio.h>
 
 int fputc(int c, FILE *stream) {
-  if (fwrite(&c, 1, 1, stream) > 0)
+  if (fwrite(&c, 1, 1, stream) > 0) {
     return c;
+  }
   return EOF;
 }
diff --git a/userland/libc/stdio/fputs.c b/userland/libc/stdio/fputs.c
index 1b70c66..5570693 100644
--- a/userland/libc/stdio/fputs.c
+++ b/userland/libc/stdio/fputs.c
@@ -2,8 +2,10 @@
 
 int fputs(const char *s, FILE *stream) {
   const char *b = s;
-  for (; *s; s++)
-    if (0 == fwrite(s, 1, 1, stream))
+  for (; *s; s++) {
+    if (0 == fwrite(s, 1, 1, stream)) {
       return EOF;
+    }
+  }
   return s - b;
 }
diff --git a/userland/libc/stdio/fscanf.c b/userland/libc/stdio/fscanf.c
index 4af79f9..f8803fc 100644
--- a/userland/libc/stdio/fscanf.c
+++ b/userland/libc/stdio/fscanf.c
@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include <assert.h>
+#include <stdio.h>
 
 int fscanf(FILE *stream, const char *format, ...) {
   va_list ap;
diff --git a/userland/libc/stdio/getchar.c b/userland/libc/stdio/getchar.c
index dad2263..e7991cd 100644
--- a/userland/libc/stdio/getchar.c
+++ b/userland/libc/stdio/getchar.c
@@ -1,4 +1,6 @@
 #include <stdio.h>
 
 // The getchar() function shall be equivalent to getc(stdin).
-int getchar(void) { return fgetc(stdin); }
+int getchar(void) {
+  return fgetc(stdin);
+}
diff --git a/userland/libc/stdio/open_memstream.c b/userland/libc/stdio/open_memstream.c
index b129cb6..b7ea70b 100644
--- a/userland/libc/stdio/open_memstream.c
+++ b/userland/libc/stdio/open_memstream.c
@@ -35,8 +35,9 @@ size_t memstream_write(FILE *fp, const unsigned char *buf, size_t n) {
 
   memcpy(c->buffer + fp->offset_in_file, buf, n);
   fp->offset_in_file += n;
-  if (fp->offset_in_file > (long)c->buffer_usage)
+  if (fp->offset_in_file > (long)c->buffer_usage) {
     c->buffer_usage = fp->offset_in_file;
+  }
   return n;
 }
 
@@ -46,8 +47,9 @@ size_t memstream_read(FILE *fp, unsigned char *buf, size_t n) {
   n = min(length_left, n);
   memcpy(buf, c->buffer + fp->offset_in_file, n);
   fp->offset_in_file += n;
-  if (0 == n)
+  if (0 == n) {
     fp->is_eof = 1;
+  }
   return n;
 }
 
@@ -73,8 +75,9 @@ int memstream_seek(FILE *stream, long offset, int whence) {
 FILE *open_memstream(char **bufp, size_t *sizep) {
   struct Memstream *c = NULL;
   FILE *fp = malloc(sizeof(FILE));
-  if (!fp)
+  if (!fp) {
     return NULL;
+  }
 
   fp->offset_in_file = 0;
   fp->buffered_char = 0;
diff --git a/userland/libc/stdio/putc.c b/userland/libc/stdio/putc.c
index a468a95..cb89ed9 100644
--- a/userland/libc/stdio/putc.c
+++ b/userland/libc/stdio/putc.c
@@ -1,3 +1,5 @@
 #include <stdio.h>
 
-int putc(int c, FILE *stream) { return fputc(c, stream);}
+int putc(int c, FILE *stream) {
+  return fputc(c, stream);
+}
diff --git a/userland/libc/stdio/remove.c b/userland/libc/stdio/remove.c
index 39f8af2..374be58 100644
--- a/userland/libc/stdio/remove.c
+++ b/userland/libc/stdio/remove.c
@@ -1,9 +1,9 @@
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
 
 extern int errno;
 int remove(const char *path) {
-	(void)path;
+  (void)path;
   // FIXME
   errno = ENAMETOOLONG;
   return -1;
diff --git a/userland/libc/stdio/rename.c b/userland/libc/stdio/rename.c
index a02cacb..676fd8c 100644
--- a/userland/libc/stdio/rename.c
+++ b/userland/libc/stdio/rename.c
@@ -5,5 +5,5 @@ int rename(const char *old, const char *new) {
   (void)old;
   (void)new;
   assert(0); // TODO: Implement
-	return 0;
+  return 0;
 }
diff --git a/userland/libc/stdio/stdin.c b/userland/libc/stdio/stdin.c
index e497167..4620df3 100644
--- a/userland/libc/stdio/stdin.c
+++ b/userland/libc/stdio/stdin.c
@@ -36,8 +36,9 @@ size_t write_fd(FILE *f, const unsigned char *s, size_t l) {
 
 size_t non_cache_read_fd(FILE *f, unsigned char *s, size_t l) {
   int rc = read(f->fd, s, l);
-  if (rc == 0)
+  if (rc == 0) {
     f->is_eof = 1;
+  }
   if (rc == -1) {
     f->has_error = 1;
     return 0;
@@ -46,8 +47,9 @@ size_t non_cache_read_fd(FILE *f, unsigned char *s, size_t l) {
 }
 
 size_t read_fd(FILE *f, unsigned char *s, size_t l) {
-  if (0 == l)
+  if (0 == l) {
     return 0;
+  }
 
   // Skip using cache if the length being requested if longer than or
   // equal to the cache block size. This avoids doing a bunch of extra
diff --git a/userland/libc/stdio/tmpfile.c b/userland/libc/stdio/tmpfile.c
index cee6e0a..9d3fb92 100644
--- a/userland/libc/stdio/tmpfile.c
+++ b/userland/libc/stdio/tmpfile.c
@@ -1,9 +1,9 @@
-#include <stdio.h>
 #include <assert.h>
+#include <stdio.h>
 
 FILE *tmpfile(void) {
-    // TODO
-    printf("TODO: Implement tmpfile()\n");
-    assert(0);
-    return NULL;
+  // TODO
+  printf("TODO: Implement tmpfile()\n");
+  assert(0);
+  return NULL;
 }
diff --git a/userland/libc/stdio/ungetc.c b/userland/libc/stdio/ungetc.c
index 3b93b70..18e5a21 100644
--- a/userland/libc/stdio/ungetc.c
+++ b/userland/libc/stdio/ungetc.c
@@ -1,8 +1,9 @@
 #include <stdio.h>
 
 int ungetc(int c, FILE *stream) {
-  if (stream->has_buffered_char)
+  if (stream->has_buffered_char) {
     return EOF;
+  }
   stream->buffered_char = c;
   stream->has_buffered_char = 1;
   fseek(stream, -1, SEEK_CUR);
diff --git a/userland/libc/stdio/vfprintf.c b/userland/libc/stdio/vfprintf.c
index d384c1d..35a7c9a 100644
--- a/userland/libc/stdio/vfprintf.c
+++ b/userland/libc/stdio/vfprintf.c
@@ -32,8 +32,9 @@ int fprint_num(FILE *f, long long n, int base, char *char_set, int prefix,
     str[i] = char_set[0];
     i++;
   } else {
-    for (; n != 0 && i < 32; i++, n /= base)
+    for (; n != 0 && i < 32; i++, n /= base) {
       str[i] = char_set[(n % base)];
+    }
   }
 
   if (is_signed) {
@@ -45,16 +46,19 @@ int fprint_num(FILE *f, long long n, int base, char *char_set, int prefix,
   int orig_i = i;
 
   if (!right_padding) {
-    for (; prefix - orig_i > 0; prefix--)
+    for (; prefix - orig_i > 0; prefix--) {
       FILE_WRITE(f, &t, 1, &c);
+    }
   }
 
-  for (i--; i >= 0; i--)
+  for (i--; i >= 0; i--) {
     FILE_WRITE(f, &(str[i]), 1, &c);
+  }
 
   if (right_padding) {
-    for (; prefix - orig_i > 0; prefix--)
+    for (; prefix - orig_i > 0; prefix--) {
       FILE_WRITE(f, &t, 1, &c);
+    }
   }
   return c;
 }
@@ -82,16 +86,19 @@ int print_string(FILE *f, const char *s, int *rc, int prefix, int right_padding,
   char t = ' ';
   int c = 0;
   if (!right_padding) {
-    if (prefix)
+    if (prefix) {
       assert(-1 == precision); // FIXME: Is this correct?
-    for (; prefix - l > 0; prefix--)
+    }
+    for (; prefix - l > 0; prefix--) {
       FILE_WRITE(f, &t, 1, &c);
+    }
   }
   int bl = precision;
   for (; *s; s++, (*rc)++) {
     if (precision != -1) {
-      if (0 == bl)
+      if (0 == bl) {
         break;
+      }
       bl--;
     }
     int r = 0;
@@ -99,8 +106,9 @@ int print_string(FILE *f, const char *s, int *rc, int prefix, int right_padding,
   }
   if (right_padding) {
     assert(-1 == precision); // FIXME: Is this correct?
-    for (; prefix - l > 0; prefix--)
+    for (; prefix - l > 0; prefix--) {
       FILE_WRITE(f, &t, 1, &c);
+    }
   }
   (*rc) += c;
   return 0;
@@ -110,8 +118,9 @@ int parse_precision(const char **fmt) {
   const char *s = *fmt;
   int rc = 0;
   for (int i = 0;; i++, s++) {
-    if ('\0' == *s)
+    if ('\0' == *s) {
       break;
+    }
     const char c = *s;
     if ('*' == c) {
       assert(i == 0);
@@ -149,8 +158,9 @@ int vfprintf(FILE *f, const char *fmt, va_list ap) {
       continue;
     }
 
-    if ('\0' == *s)
+    if ('\0' == *s) {
       break;
+    }
 
     switch (*s) {
     case '.':
@@ -158,14 +168,16 @@ int vfprintf(FILE *f, const char *fmt, va_list ap) {
       assert('\0' != *s);
       precision = parse_precision(&s);
       assert('\0' != *s);
-      if (-1 == precision)
+      if (-1 == precision) {
         precision = va_arg(ap, int);
+      }
       cont = 1;
       break;
     case '0':
       prefix *= 10;
-      if (0 == prefix)
+      if (0 == prefix) {
         zero_padding = 1;
+      }
       cont = 1;
       break;
     case '-':
@@ -221,13 +233,15 @@ int vfprintf(FILE *f, const char *fmt, va_list ap) {
       char *a = va_arg(ap, char *);
       if (!a) {
         if (-1 ==
-            print_string(f, "(NULL)", &rc, prefix, right_padding, precision))
+            print_string(f, "(NULL)", &rc, prefix, right_padding, precision)) {
           return -1;
+        }
         cont = 0;
         break;
       }
-      if (-1 == print_string(f, a, &rc, prefix, right_padding, precision))
+      if (-1 == print_string(f, a, &rc, prefix, right_padding, precision)) {
         return -1;
+      }
       cont = 0;
       break;
     }
diff --git a/userland/libc/stdio/vprintf.c b/userland/libc/stdio/vprintf.c
index 8a8dc33..c06e9f9 100644
--- a/userland/libc/stdio/vprintf.c
+++ b/userland/libc/stdio/vprintf.c
@@ -1,3 +1,5 @@
 #include <stdio.h>
 
-int vprintf(const char *format, va_list ap) { return vdprintf(1, format, ap); }
+int vprintf(const char *format, va_list ap) {
+  return vdprintf(1, format, ap);
+}
diff --git a/userland/libc/stdlib/abort.c b/userland/libc/stdlib/abort.c
index 90368a9..5279676 100644
--- a/userland/libc/stdlib/abort.c
+++ b/userland/libc/stdlib/abort.c
@@ -1,6 +1,6 @@
 #include <assert.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 // https://pubs.opengroup.org/onlinepubs/9699919799/functions/abort.html
 void abort(void) {
diff --git a/userland/libc/stdlib/abs.c b/userland/libc/stdlib/abs.c
index 1079beb..9e50b0a 100644
--- a/userland/libc/stdlib/abs.c
+++ b/userland/libc/stdlib/abs.c
@@ -1,3 +1,5 @@
 #include <stdlib.h>
 
-int abs(int i) { return (i < 0) ? (-i) : (i); }
+int abs(int i) {
+  return (i < 0) ? (-i) : (i);
+}
diff --git a/userland/libc/stdlib/atexit.c b/userland/libc/stdlib/atexit.c
index 0e401ff..1dc34cc 100644
--- a/userland/libc/stdlib/atexit.c
+++ b/userland/libc/stdlib/atexit.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
 int atexit(void (*func)(void)) {
-	//TODO
-	return 0;
+  // TODO
+  return 0;
 }
diff --git a/userland/libc/stdlib/atof.c b/userland/libc/stdlib/atof.c
index 8524f8b..f008852 100644
--- a/userland/libc/stdlib/atof.c
+++ b/userland/libc/stdlib/atof.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
 
 double atof(const char *str) {
-	return strtod(str,(char **)NULL);
+  return strtod(str, (char **)NULL);
 }
diff --git a/userland/libc/stdlib/atoi.c b/userland/libc/stdlib/atoi.c
index 2183306..876f69a 100644
--- a/userland/libc/stdlib/atoi.c
+++ b/userland/libc/stdlib/atoi.c
@@ -1,4 +1,6 @@
 #include <stdlib.h>
 
 // https://pubs.opengroup.org/onlinepubs/9699919799/
-int atoi(const char *str) { return (int)strtol(str, (char **)NULL, 10); }
+int atoi(const char *str) {
+  return (int)strtol(str, (char **)NULL, 10);
+}
diff --git a/userland/libc/stdlib/getenv.c b/userland/libc/stdlib/getenv.c
index 13d871c..0240d66 100644
--- a/userland/libc/stdlib/getenv.c
+++ b/userland/libc/stdlib/getenv.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 
 char *getenv(const char *name) {
-	(void)name;
-    // FIXME
-    return NULL;
+  (void)name;
+  // FIXME
+  return NULL;
 }
diff --git a/userland/libc/stdlib/mkstemp.c b/userland/libc/stdlib/mkstemp.c
index 1ea8790..0dec8e9 100644
--- a/userland/libc/stdlib/mkstemp.c
+++ b/userland/libc/stdlib/mkstemp.c
@@ -1,14 +1,17 @@
 #include <fcntl.h>
 #include <stdlib.h>
 
-char rand_char(void) { return 'A' + (rand() % 10); }
+char rand_char(void) {
+  return 'A' + (rand() % 10);
+}
 
 int mkstemp(char *template) {
   // FIXME: Incomplete
   const char *s = template;
   for (; *template; template ++) {
-    if ('X' == *template)
+    if ('X' == *template) {
       *template = rand_char();
+    }
   }
   return open(s, O_RDWR, O_CREAT);
 }
diff --git a/userland/libc/stdlib/qsort.c b/userland/libc/stdlib/qsort.c
index 3f87db5..f60fa5d 100644
--- a/userland/libc/stdlib/qsort.c
+++ b/userland/libc/stdlib/qsort.c
@@ -6,9 +6,10 @@ void qsort(void *base, size_t nel, size_t width,
            int (*compar)(const void *, const void *)) {
   // If the nel argument has the value zero, the comparison function pointed to
   // by compar shall not be called and no rearrangement shall take place.
-  if (0 == nel)
+  if (0 == nel) {
     return;
-  
+  }
+
   // AB
   // Results in negative
   // BA
diff --git a/userland/libc/stdlib/strtod.c b/userland/libc/stdlib/strtod.c
index 2c83879..01119bb 100644
--- a/userland/libc/stdlib/strtod.c
+++ b/userland/libc/stdlib/strtod.c
@@ -1,8 +1,10 @@
+#include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <assert.h>
 
-int ctoi(char c) { return c - '0'; }
+int ctoi(char c) {
+  return c - '0';
+}
 
 double strtod(const char *restrict nptr, char **restrict endptr) {
   double r = 0;
diff --git a/userland/libc/stdlib/strtol.c b/userland/libc/stdlib/strtol.c
index 460dedd..0b1bbad 100644
--- a/userland/libc/stdlib/strtol.c
+++ b/userland/libc/stdlib/strtol.c
@@ -9,13 +9,15 @@ int get_value(char c, long base);
 // https://pubs.opengroup.org/onlinepubs/9699919799/functions/strtol.html
 long strtol(const char *str, char **restrict endptr, int base) {
   long ret_value = 0;
-  if (endptr)
+  if (endptr) {
     *endptr = (char *)str;
+  }
   // Ignore inital white-space sequence
   for (; *str && isspace(*str); str++)
     ;
-  if (!*str)
+  if (!*str) {
     return ret_value;
+  }
 
   //  int sign = 0;
   if ('-' == *str) {
@@ -63,7 +65,8 @@ long strtol(const char *str, char **restrict endptr, int base) {
     errno = EINVAL;
     return 0;
   }
-  if (endptr)
+  if (endptr) {
     *endptr = (char *)str;
+  }
   return ret_value;
 }
diff --git a/userland/libc/stdlib/strtoll.c b/userland/libc/stdlib/strtoll.c
index 0e397ff..9a2a624 100644
--- a/userland/libc/stdlib/strtoll.c
+++ b/userland/libc/stdlib/strtoll.c
@@ -9,13 +9,15 @@ int get_value(char c, long base);
 // https://pubs.opengroup.org/onlinepubs/9699919799/functions/strtoll.html
 long long strtoll(const char *str, char **restrict endptr, int base) {
   long long ret_value = 0;
-  if (endptr)
+  if (endptr) {
     *endptr = (char *)str;
+  }
   // Ignore inital white-space sequence
   for (; *str && isspace(*str); str++)
     ;
-  if (!*str)
+  if (!*str) {
     return ret_value;
+  }
 
   //  int sign = 0;
   if ('-' == *str) {
@@ -45,7 +47,7 @@ long long strtoll(const char *str, char **restrict endptr, int base) {
   if (2 <= base && 36 >= base) {
     for (; *str; str++) {
       int val = get_value(*str, base);
-      if(-1 == val) {
+      if (-1 == val) {
         break;
       }
       if (ret_value > LLONG_MAX / base) {
@@ -63,7 +65,8 @@ long long strtoll(const char *str, char **restrict endptr, int base) {
     errno = EINVAL;
     return 0;
   }
-  if (endptr)
+  if (endptr) {
     *endptr = (char *)str;
+  }
   return ret_value;
 }
diff --git a/userland/libc/stdlib/strtoul.c b/userland/libc/stdlib/strtoul.c
index 39dc8eb..0f2c71b 100644
--- a/userland/libc/stdlib/strtoul.c
+++ b/userland/libc/stdlib/strtoul.c
@@ -25,13 +25,15 @@ int get_value(char c, long base) {
 unsigned long strtoul(const char *restrict str, char **restrict endptr,
                       int base) {
   unsigned long ret_value = 0;
-  if (endptr)
+  if (endptr) {
     *endptr = (char *)str;
+  }
   // Ignore inital white-space sequence
   for (; *str && isspace(*str); str++)
     ;
-  if (!*str)
+  if (!*str) {
     return ret_value;
+  }
 
   //  int sign = 0;
   if ('-' == *str) {
@@ -79,7 +81,8 @@ unsigned long strtoul(const char *restrict str, char **restrict endptr,
     errno = EINVAL;
     return 0;
   }
-  if (endptr)
+  if (endptr) {
     *endptr = (char *)str;
+  }
   return ret_value;
 }
diff --git a/userland/libc/stdlib/system.c b/userland/libc/stdlib/system.c
index 1cba966..c35bee5 100644
--- a/userland/libc/stdlib/system.c
+++ b/userland/libc/stdlib/system.c
@@ -1,10 +1,11 @@
 #include <stdlib.h>
-#include <unistd.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 int system(const char *command) {
-  if (!command)
+  if (!command) {
     return NULL;
+  }
   int pid = fork();
   if (0 == pid) {
     char *argv[2];
diff --git a/userland/libc/string/memchr.c b/userland/libc/string/memchr.c
index cef3bc2..0d581f4 100644
--- a/userland/libc/string/memchr.c
+++ b/userland/libc/string/memchr.c
@@ -4,7 +4,7 @@ void *memchr(const void *s, int c, size_t n) {
   const char *p = s;
   for (; n > 0; n--, p++) {
     if (*p == c) {
-      return (void*)p;
+      return (void *)p;
     }
   }
   return NULL;
diff --git a/userland/libc/string/memcmp.c b/userland/libc/string/memcmp.c
index 01109b8..157189f 100644
--- a/userland/libc/string/memcmp.c
+++ b/userland/libc/string/memcmp.c
@@ -3,9 +3,11 @@
 int memcmp(const void *s1, const void *s2, size_t n) {
   int return_value = 0;
 
-  for (uint32_t i = 0; i < n; i++)
-    if (((unsigned char *)(s1))[i] != ((unsigned char *)(s2))[i])
+  for (uint32_t i = 0; i < n; i++) {
+    if (((unsigned char *)(s1))[i] != ((unsigned char *)(s2))[i]) {
       return_value++;
+    }
+  }
 
   return return_value;
 }
diff --git a/userland/libc/string/memcpy.c b/userland/libc/string/memcpy.c
index 7a9f01e..65f646d 100644
--- a/userland/libc/string/memcpy.c
+++ b/userland/libc/string/memcpy.c
@@ -4,15 +4,19 @@ void *memcpy(void *dest, const void *src, uint32_t n) {
   unsigned char *d = dest;
   const unsigned char *s = src;
 
-  for (; n >= 8; n -= 8, d += 8, s += 8)
+  for (; n >= 8; n -= 8, d += 8, s += 8) {
     *(uint64_t *)d = *(uint64_t *)s;
+  }
 
-  for (; n >= 4; n -= 4, d += 4, s += 4)
+  for (; n >= 4; n -= 4, d += 4, s += 4) {
     *(uint32_t *)d = *(uint32_t *)s;
+  }
 
-  for (; n >= 2; n -= 2, d += 2, s += 2)
+  for (; n >= 2; n -= 2, d += 2, s += 2) {
     *(uint16_t *)d = *(uint16_t *)s;
-  for (; n; n--)
+  }
+  for (; n; n--) {
     *d++ = *s++;
+  }
   return dest;
 }
diff --git a/userland/libc/string/sscanf.c b/userland/libc/string/sscanf.c
index e1ede63..8a3ed0e 100644
--- a/userland/libc/string/sscanf.c
+++ b/userland/libc/string/sscanf.c
@@ -38,8 +38,9 @@ long ftnum(FILE *stream, int base, int *error) {
     return 0;
   }
   for (;;) {
-    if (EOF == (c = fgetc(stream)))
+    if (EOF == (c = fgetc(stream))) {
       break;
+    }
     if (c == '\0') {
       ungetc(c, stream);
       break;
@@ -69,13 +70,15 @@ int vfscanf(FILE *stream, const char *format, va_list ap) {
   for (; *format; format++) {
     if (*format != '%' && !cont) {
       char c;
-      if (isspace(*format))
+      if (isspace(*format)) {
         continue;
+      }
       if (EOF == (c = fgetc(stream))) {
         break;
       }
-      if (*format == c) // TODO: Make sure this is the correct behaviour
+      if (*format == c) { // TODO: Make sure this is the correct behaviour
         continue;
+      }
       // TODO: Make sure this is the correct behaviour
       errno = EINVAL;
       assert(0);
@@ -164,8 +167,9 @@ size_t sscanf_read(FILE *f, unsigned char *s, size_t l) {
     s++;
     r++;
   }
-  if (!(*(c->s + c->offset)))
+  if (!(*(c->s + c->offset))) {
     f->is_eof = 1;
+  }
   /*
   memcpy(s, c->s, l);
   c->s += l;*/
diff --git a/userland/libc/string/strcasecmp.c b/userland/libc/string/strcasecmp.c
index 6420dbf..399ebc2 100644
--- a/userland/libc/string/strcasecmp.c
+++ b/userland/libc/string/strcasecmp.c
@@ -7,8 +7,9 @@ int strcasecmp(const char *s1, const char *s2) {
   int l1, l2, rc;
   l1 = l2 = rc = 0;
   for (; (*s1 || *s2);) {
-    if (tolower(*s1) != tolower(*s2))
+    if (tolower(*s1) != tolower(*s2)) {
       rc++;
+    }
     if (*s1) {
       l1++;
       s1++;
@@ -23,7 +24,8 @@ int strcasecmp(const char *s1, const char *s2) {
   // equal to, or less than 0, if the string pointed to by s1 is
   // greater than, equal to, or less than the string pointed to by
   // s2, respectively.
-  if (l2 > l1)
+  if (l2 > l1) {
     return -rc;
+  }
   return rc;
 }
diff --git a/userland/libc/string/strchr.c b/userland/libc/string/strchr.c
index 1995547..179e47c 100644
--- a/userland/libc/string/strchr.c
+++ b/userland/libc/string/strchr.c
@@ -2,10 +2,12 @@
 
 char *strchr(const char *s, int c) {
   for (; *s; s++) {
-    if (*s == (char)c)
-      return (char*)s;
+    if (*s == (char)c) {
+      return (char *)s;
+    }
   }
-  if ((char)c == '\0')
+  if ((char)c == '\0') {
     return (char *)s;
+  }
   return NULL;
 }
diff --git a/userland/libc/string/strcmp.c b/userland/libc/string/strcmp.c
index 368b8fb..b07f023 100644
--- a/userland/libc/string/strcmp.c
+++ b/userland/libc/string/strcmp.c
@@ -7,8 +7,9 @@ int strcmp(const char *s1, const char *s2) {
   int l1, l2, rc;
   l1 = l2 = rc = 0;
   for (; *s1 || *s2;) {
-    if (*s1 != *s2)
+    if (*s1 != *s2) {
       rc++;
+    }
     if (*s1) {
       l1++;
       s1++;
@@ -23,7 +24,8 @@ int strcmp(const char *s1, const char *s2) {
   // equal to, or less than 0, if the string pointed to by s1 is
   // greater than, equal to, or less than the string pointed to by
   // s2, respectively.
-  if (l2 > l1)
+  if (l2 > l1) {
     return -rc;
+  }
   return rc;
 }
diff --git a/userland/libc/string/strcspn.c b/userland/libc/string/strcspn.c
index 2ad38d5..fb5fe50 100644
--- a/userland/libc/string/strcspn.c
+++ b/userland/libc/string/strcspn.c
@@ -6,7 +6,7 @@ size_t strcspn(const char *s1, const char *s2) {
     for (const char *t = s2; *t; t++) {
       if (*s1 == *s2) {
         r++;
-	break;
+        break;
       }
     }
   }
diff --git a/userland/libc/string/strdup.c b/userland/libc/string/strdup.c
index 9e22f94..ead535a 100644
--- a/userland/libc/string/strdup.c
+++ b/userland/libc/string/strdup.c
@@ -8,8 +8,9 @@
 char *strdup(const char *s) {
   size_t l = strlen(s);
   char *r = malloc(l + 1);
-  if (!r)
+  if (!r) {
     return NULL;
+  }
   strcpy(r, s);
   return r;
 }
diff --git a/userland/libc/string/strlcpy.c b/userland/libc/string/strlcpy.c
index a2d3dd9..041522b 100644
--- a/userland/libc/string/strlcpy.c
+++ b/userland/libc/string/strlcpy.c
@@ -7,12 +7,14 @@ size_t *strlcpy(char *s1, const char *s2, size_t n) {
   size_t tmp_n = n;
   const char *os2 = s2;
   for (; tmp_n; tmp_n--) {
-    if ((*s1++ = *s2++) == '\0')
+    if ((*s1++ = *s2++) == '\0') {
       break;
+    }
   }
   if (tmp_n == 0) {
-    if (n != 0)
+    if (n != 0) {
       *s1 = '\0'; /* NUL-terminate s1 */
+    }
     while (*s2++)
       ;
   }
diff --git a/userland/libc/string/strncasecmp.c b/userland/libc/string/strncasecmp.c
index c635a03..8a7768c 100644
--- a/userland/libc/string/strncasecmp.c
+++ b/userland/libc/string/strncasecmp.c
@@ -1,6 +1,6 @@
-#include <strings.h>
 #include <ctype.h>
 #include <stddef.h>
+#include <strings.h>
 
 int strncasecmp(const char *s1, const char *s2, size_t n) {
   // The strcmp() function shall compare the string pointed to by s1
@@ -8,8 +8,9 @@ int strncasecmp(const char *s1, const char *s2, size_t n) {
   int l1, l2, rc;
   l1 = l2 = rc = 0;
   for (; (*s1 || *s2) && n > 0; n--) {
-    if (tolower(*s1) != tolower(*s2))
+    if (tolower(*s1) != tolower(*s2)) {
       rc++;
+    }
     if (*s1) {
       l1++;
       s1++;
@@ -24,7 +25,8 @@ int strncasecmp(const char *s1, const char *s2, size_t n) {
   // equal to, or less than 0, if the string pointed to by s1 is
   // greater than, equal to, or less than the string pointed to by
   // s2, respectively.
-  if (l2 > l1)
+  if (l2 > l1) {
     return -rc;
+  }
   return rc;
 }
diff --git a/userland/libc/string/strncmp.c b/userland/libc/string/strncmp.c
index fd46189..3d6383b 100644
--- a/userland/libc/string/strncmp.c
+++ b/userland/libc/string/strncmp.c
@@ -6,8 +6,9 @@ int strncmp(const char *s1, const char *s2, size_t n) {
   int l1, l2, rc;
   l1 = l2 = rc = 0;
   for (; (*s1 || *s2) && n > 0; n--) {
-    if (*s1 != *s2)
+    if (*s1 != *s2) {
       rc++;
+    }
     if (*s1) {
       l1++;
       s1++;
@@ -22,7 +23,8 @@ int strncmp(const char *s1, const char *s2, size_t n) {
   // equal to, or less than 0, if the string pointed to by s1 is
   // greater than, equal to, or less than the string pointed to by
   // s2, respectively.
-  if (l2 > l1)
+  if (l2 > l1) {
     return -rc;
+  }
   return rc;
 }
diff --git a/userland/libc/string/strncpy.c b/userland/libc/string/strncpy.c
index 0e88c63..fb89d38 100644
--- a/userland/libc/string/strncpy.c
+++ b/userland/libc/string/strncpy.c
@@ -4,10 +4,12 @@ char *strncpy(char *s1, const char *s2, size_t n) {
   char *rc = s1;
   for (; n > 0; s1++, s2++, n--) {
     *s1 = *s2;
-    if (!*s2)
+    if (!*s2) {
       break;
+    }
   }
-  for (; n > 0; n--,s1++)
+  for (; n > 0; n--, s1++) {
     *s1 = '\0';
+  }
   return rc;
 }
diff --git a/userland/libc/string/strndup.c b/userland/libc/string/strndup.c
index 22d6303..3240d97 100644
--- a/userland/libc/string/strndup.c
+++ b/userland/libc/string/strndup.c
@@ -1,7 +1,7 @@
+#include <math.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
 // The strndup() function shall be equivalent to the strdup() function,
 // duplicating the provided s in a new block of memory allocated as if
@@ -16,8 +16,9 @@ char *strndup(const char *s, size_t size) {
   size_t l = strlen(s);
   size_t real_l = min(l, size);
   char *r = malloc(real_l + 1);
-  if (!r)
+  if (!r) {
     return NULL;
+  }
   strlcpy(r, s, real_l);
   return r;
 }
diff --git a/userland/libc/string/strnlen.c b/userland/libc/string/strnlen.c
index 86df42e..50f907e 100644
--- a/userland/libc/string/strnlen.c
+++ b/userland/libc/string/strnlen.c
@@ -2,8 +2,10 @@
 
 size_t strnlen(const char *s, size_t maxlen) {
   size_t i;
-  for (i = 0; i < maxlen; i++)
-    if (s[i] == 0)
+  for (i = 0; i < maxlen; i++) {
+    if (s[i] == 0) {
       break;
+    }
+  }
   return i;
 }
diff --git a/userland/libc/string/strpbrk.c b/userland/libc/string/strpbrk.c
index 3bb058b..cbe51de 100644
--- a/userland/libc/string/strpbrk.c
+++ b/userland/libc/string/strpbrk.c
@@ -4,7 +4,7 @@ char *strpbrk(const char *s1, const char *s2) {
   for (; *s1; s1++) {
     for (const char *t = s2; *t; t++) {
       if (*s1 == *t) {
-        return (char*)s1;
+        return (char *)s1;
       }
     }
   }
diff --git a/userland/libc/string/strrchr.c b/userland/libc/string/strrchr.c
index a44199a..30b625d 100644
--- a/userland/libc/string/strrchr.c
+++ b/userland/libc/string/strrchr.c
@@ -3,10 +3,12 @@
 char *strrchr(const char *s, int c) {
   char *last = NULL;
   for (; *s; s++) {
-    if (*s == (char)c)
+    if (*s == (char)c) {
       last = (char *)s;
+    }
+  }
+  if ((char)c == '\0') {
+    last = (char *)s;
   }
-  if ((char)c == '\0')
-    last = (char*)s;
   return last;
 }
diff --git a/userland/libc/string/strspn.c b/userland/libc/string/strspn.c
index 2a7d3ae..d6b1595 100644
--- a/userland/libc/string/strspn.c
+++ b/userland/libc/string/strspn.c
@@ -10,8 +10,9 @@ size_t strspn(const char *s1, const char *s2) {
         break;
       }
     }
-    if (!e)
+    if (!e) {
       break;
+    }
     r++;
   }
   return r;
diff --git a/userland/libc/string/strstr.c b/userland/libc/string/strstr.c
index 9de0954..4300f24 100644
--- a/userland/libc/string/strstr.c
+++ b/userland/libc/string/strstr.c
@@ -2,8 +2,9 @@
 
 char *strstr(const char *s1, const char *s2) {
   // If s2 points to a string with zero length, the function shall return s1.
-  if ('\0' == *s2)
-    return (char*)s1;
+  if ('\0' == *s2) {
+    return (char *)s1;
+  }
   for (; *s1; s1++) {
     const char *t1 = s1;
     const char *t2 = s2;
@@ -14,8 +15,9 @@ char *strstr(const char *s1, const char *s2) {
         break;
       }
     }
-    if (!is_dif)
-      return (char*)s1;
+    if (!is_dif) {
+      return (char *)s1;
+    }
   }
   return NULL;
 }
diff --git a/userland/libc/string/strtok.c b/userland/libc/string/strtok.c
index 7b8d0e3..a4a9d0f 100644
--- a/userland/libc/string/strtok.c
+++ b/userland/libc/string/strtok.c
@@ -7,18 +7,20 @@ char *strtok(char *restrict s, const char *restrict sep) {
     strtok_s = s;
     return strtok(NULL, sep);
   }
-	if(!strtok_s)
-		return NULL;
+  if (!strtok_s) {
+    return NULL;
+  }
   char *e = strpbrk(strtok_s, sep);
   if (!e) {
-	  char *r = strtok_s;
-	  strtok_s = NULL;
+    char *r = strtok_s;
+    strtok_s = NULL;
     return r;
   }
   *e = '\0';
   e--;
-  for (; *sep; sep++)
+  for (; *sep; sep++) {
     e++;
+  }
   e++;
   char *r = strtok_s;
   strtok_s = e;
diff --git a/userland/libc/sys/mman.h b/userland/libc/sys/mman.h
index e3ff734..a915291 100644
--- a/userland/libc/sys/mman.h
+++ b/userland/libc/sys/mman.h
@@ -1,7 +1,7 @@
 #ifndef MMAP_H
 #define MMAP_H
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 void *mmap(void *addr, size_t length, int prot, int flags, int fd,
            size_t offset);
diff --git a/userland/libc/sys/mman/mmap.c b/userland/libc/sys/mman/mmap.c
index b9ad3a2..53c6f77 100644
--- a/userland/libc/sys/mman/mmap.c
+++ b/userland/libc/sys/mman/mmap.c
@@ -1,6 +1,6 @@
-#include <syscall.h>
 #include <errno.h>
 #include <sys/mman.h>
+#include <syscall.h>
 
 extern int errno;
 
@@ -14,6 +14,6 @@ void *mmap(void *addr, size_t length, int prot, int flags, int fd,
       .fd = fd,
       .offset = offset,
   };
-//  return (void*)syscall(SYS_MMAP, &args, 0, 0, 0, 0);
+  //  return (void*)syscall(SYS_MMAP, &args, 0, 0, 0, 0);
   RC_ERRNO(syscall(SYS_MMAP, &args, 0, 0, 0, 0));
 }
diff --git a/userland/libc/sys/mman/munmap.c b/userland/libc/sys/mman/munmap.c
index 940ea46..5750cb4 100644
--- a/userland/libc/sys/mman/munmap.c
+++ b/userland/libc/sys/mman/munmap.c
@@ -2,5 +2,5 @@
 #include <syscall.h>
 
 int munmap(void *addr, size_t length) {
-  RC_ERRNO(syscall(SYS_MUNMAP, addr, length,0, 0, 0));
+  RC_ERRNO(syscall(SYS_MUNMAP, addr, length, 0, 0, 0));
 }
diff --git a/userland/libc/sys/sendfile.c b/userland/libc/sys/sendfile.c
index 818883b..9de931b 100644
--- a/userland/libc/sys/sendfile.c
+++ b/userland/libc/sys/sendfile.c
@@ -1,6 +1,6 @@
+#include <errno.h>
 #include <sys/sendfile.h>
 #include <syscall.h>
-#include <errno.h>
 
 u32 sendfile(int out_fd, int in_fd, off_t *offset, size_t count,
              int *error_rc) {
diff --git a/userland/libc/sys/socket/listen.c b/userland/libc/sys/socket/listen.c
index a3bec10..67cc6ce 100644
--- a/userland/libc/sys/socket/listen.c
+++ b/userland/libc/sys/socket/listen.c
@@ -1,9 +1,9 @@
-#include <sys/socket.h>
 #include <stdio.h>
+#include <sys/socket.h>
 
 int listen(int socket, int backlog) {
-	(void)socket;
-	(void)backlog;
+  (void)socket;
+  (void)backlog;
   printf("TODO: Implement listen()\n");
   return 0;
 }
diff --git a/userland/libc/sys/socket/sendto.c b/userland/libc/sys/socket/sendto.c
index 73437ab..be35ec0 100644
--- a/userland/libc/sys/socket/sendto.c
+++ b/userland/libc/sys/socket/sendto.c
@@ -7,7 +7,7 @@ struct two_args {
 };
 
 size_t sendto(int socket, const void *message, size_t length, int flags,
-               const struct sockaddr *dest_addr, socklen_t dest_len) {
+              const struct sockaddr *dest_addr, socklen_t dest_len) {
   struct two_args extra = {
       .a = dest_addr,
       .b = dest_len,
diff --git a/userland/libc/sys/time/gettimeofday.c b/userland/libc/sys/time/gettimeofday.c
index e172cf2..3487254 100644
--- a/userland/libc/sys/time/gettimeofday.c
+++ b/userland/libc/sys/time/gettimeofday.c
@@ -1,5 +1,7 @@
 #include <sys/time.h>
 #include <time.h>
 
-static int return_tod =0;
-int gettimeofday(struct timeval *tp, void *tzp) {return return_tod++;}
+static int return_tod = 0;
+int gettimeofday(struct timeval *tp, void *tzp) {
+  return return_tod++;
+}
diff --git a/userland/libc/sys/types.h b/userland/libc/sys/types.h
index ffcf281..d9bede0 100644
--- a/userland/libc/sys/types.h
+++ b/userland/libc/sys/types.h
@@ -16,12 +16,12 @@ typedef int dev_t;
 typedef unsigned int fsblkcnt_t;
 typedef unsigned int fsfilcnt_t;
 typedef unsigned int ino_t;
-//typedef unsigned int size_t;
+// typedef unsigned int size_t;
 
 typedef int blksize_t;
 typedef int pid_t;
 typedef int ssize_t;
 
-//typedef int clock_t;
+// typedef int clock_t;
 typedef int time_t;
 #endif
diff --git a/userland/libc/tb/sha1.c b/userland/libc/tb/sha1.c
index 90e4e2a..1f68672 100644
--- a/userland/libc/tb/sha1.c
+++ b/userland/libc/tb/sha1.c
@@ -3,10 +3,10 @@
 //
 // SPDX-License-Identifier: 0BSD
 //
-#include <tb/sha1.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
+#include <tb/sha1.h>
 
 #define SHA1_CONSTANT_H0 0x67452301
 #define SHA1_CONSTANT_H1 0xefcdab89
@@ -57,10 +57,11 @@ void pad_sha1_message(uint8_t *M, uint64_t l, uint64_t active_l,
   // solution to the equation 'l + 1 + k \cong 448 mod 512'
   int k;
   uint64_t rest = (active_l + 1) % 512;
-  if (rest < 448)
+  if (rest < 448) {
     k = 448 - rest;
-  else
+  } else {
     k = 512 - rest + 448;
+  }
 
   memset(block + ARRAY_NUM(active_l) + 2, 0x0, k / 8);
 
@@ -90,14 +91,18 @@ uint32_t sha1_f(uint8_t t, uint32_t x, uint32_t y, uint32_t z) {
 }
 
 uint32_t sha1_get_k(uint8_t t) {
-  if (t <= 19)
+  if (t <= 19) {
     return SHA1_CONSTANT_K1;
-  if (t <= 39)
+  }
+  if (t <= 39) {
     return SHA1_CONSTANT_K2;
-  if (t <= 59)
+  }
+  if (t <= 59) {
     return SHA1_CONSTANT_K3;
-  if (t <= 79)
+  }
+  if (t <= 79) {
     return SHA1_CONSTANT_K4;
+  }
   return 0;
 }
 
@@ -109,16 +114,18 @@ uint32_t ROTL(uint32_t value, uint8_t shift) {
 
 void add_block(SHA1_CTX *ctx, uint8_t *_block) {
   uint32_t *block = (uint32_t *)_block;
-  for (size_t i = 0; i < 16; i++)
+  for (size_t i = 0; i < 16; i++) {
     block[i] = reverse_32(block[i]);
+  }
 
   uint32_t W[80];
   uint32_t a, b, c, d, e;
   uint32_t *M = block;
 
   // 1. Prepare the message schedule, {Wt}:
-  for (size_t t = 0; t < 16; t++)
+  for (size_t t = 0; t < 16; t++) {
     W[t] = M[t];
+  }
 
   for (size_t t = 16; t < 80; t++) {
     // ROTL(1)(W(t-3) ^ W(t-8) ^ W(t-16))
@@ -157,14 +164,17 @@ void SHA1_Final(SHA1_CTX *ctx, unsigned char *message_digest) {
 
   add_block(ctx, block);
 
-  if (((ctx->active_len * 8 + 1) % 512) >= 448)
+  if (((ctx->active_len * 8 + 1) % 512) >= 448) {
     add_block(ctx, block + BLOCK_BYTES);
+  }
 
-  for (size_t i = 0; i < 5; i++)
+  for (size_t i = 0; i < 5; i++) {
     ctx->h[i] = reverse_32(ctx->h[i]);
+  }
 
-  for (size_t i = 0; i < 5; i++)
+  for (size_t i = 0; i < 5; i++) {
     memcpy(message_digest + sizeof(uint32_t) * i, &ctx->h[i], sizeof(uint32_t));
+  }
 }
 
 void SHA1_Update(SHA1_CTX *ctx, const void *data, uint64_t len) {
@@ -176,8 +186,9 @@ void SHA1_Update(SHA1_CTX *ctx, const void *data, uint64_t len) {
     memcpy(ctx->block + ctx->active_len, data, write_len);
     ctx->len += write_len;
     ctx->active_len += write_len;
-    if (BLOCK_BYTES != ctx->active_len)
+    if (BLOCK_BYTES != ctx->active_len) {
       return;
+    }
 
     add_block(ctx, ctx->block);
     memset(ctx->block, 0, BLOCK_BYTES);
diff --git a/userland/libc/time/gmtime.c b/userland/libc/time/gmtime.c
index 08af482..0b5b09e 100644
--- a/userland/libc/time/gmtime.c
+++ b/userland/libc/time/gmtime.c
@@ -16,7 +16,7 @@ struct tm gmtime_r = {
 
 // https://pubs.opengroup.org/onlinepubs/9699919799/functions/gmtime.html
 struct tm *gmtime(const time_t *timer) {
-	(void)timer;
+  (void)timer;
   // TODO: Implement
   return &gmtime_r;
 }
diff --git a/userland/libc/time/localtime.c b/userland/libc/time/localtime.c
index 8ad74d8..ce15ffb 100644
--- a/userland/libc/time/localtime.c
+++ b/userland/libc/time/localtime.c
@@ -1,22 +1,22 @@
 #include <time.h>
 
-  struct tm localtime_r = {
-      .tm_sec = 0,
-      .tm_min = 0,
-      .tm_hour = 0,
-      .tm_mday = 0,
-      .tm_mon = 0,
-      .tm_year = 0,
-      .tm_wday = 0,
-      .tm_yday = 0,
-      .tm_isdst = 0,
-      .__tm_gmtoff = 0,
-      .__tm_zone = 0,
-  };
+struct tm localtime_r = {
+    .tm_sec = 0,
+    .tm_min = 0,
+    .tm_hour = 0,
+    .tm_mday = 0,
+    .tm_mon = 0,
+    .tm_year = 0,
+    .tm_wday = 0,
+    .tm_yday = 0,
+    .tm_isdst = 0,
+    .__tm_gmtoff = 0,
+    .__tm_zone = 0,
+};
 
 // https://pubs.opengroup.org/onlinepubs/9699919799/functions/localtime.html
 struct tm *localtime(const time_t *timer) {
-	(void)timer;
+  (void)timer;
   // TODO: Implement
   return &localtime_r;
 }
diff --git a/userland/libc/time/strftime.c b/userland/libc/time/strftime.c
index 30a080d..b6a5f58 100644
--- a/userland/libc/time/strftime.c
+++ b/userland/libc/time/strftime.c
@@ -1,7 +1,7 @@
-#include <time.h>
 #include <stddef.h>
+#include <time.h>
 
-size_t strftime(char *restrict s, size_t maxsize,
-       const char *restrict format, const struct tm *restrict timeptr) {
-	return 0;
+size_t strftime(char *restrict s, size_t maxsize, const char *restrict format,
+                const struct tm *restrict timeptr) {
+  return 0;
 }
diff --git a/userland/libc/time/time.c b/userland/libc/time/time.c
index 9931b71..fa025ce 100644
--- a/userland/libc/time/time.c
+++ b/userland/libc/time/time.c
@@ -3,7 +3,8 @@
 time_t time(time_t *tloc) {
   struct timespec ts;
   clock_gettime(CLOCK_REALTIME, &ts);
-  if (tloc)
+  if (tloc) {
     *tloc = ts.tv_sec;
+  }
   return ts.tv_sec;
 }
diff --git a/userland/libc/ubsan.c b/userland/libc/ubsan.c
index 9ac9879..90e2eb4 100644
--- a/userland/libc/ubsan.c
+++ b/userland/libc/ubsan.c
@@ -29,8 +29,8 @@ void __ubsan_handle_sub_overflow(struct OverflowData *data, unsigned long lhs,
   ubsan_log("handle_sub_overflow", data->location);
 }
 
-void __ubsan_handle_negate_overflow(struct OverflowData *data, unsigned long lhs,
-                                 unsigned long rhs) {
+void __ubsan_handle_negate_overflow(struct OverflowData *data,
+                                    unsigned long lhs, unsigned long rhs) {
   (void)lhs;
   (void)rhs;
   ubsan_log("handle_negate_overflow", data->location);
diff --git a/userland/libc/unistd/_exit.c b/userland/libc/unistd/_exit.c
index c6d64be..a6cc645 100644
--- a/userland/libc/unistd/_exit.c
+++ b/userland/libc/unistd/_exit.c
@@ -5,4 +5,6 @@
 // stackoverflow answer says that it does not usually matter. So lets
 // hope that is the case.
 // https://stackoverflow.com/a/5423108
-void _exit(int status) { syscall(SYS_EXIT, (void *)status, 0, 0, 0, 0); }
+void _exit(int status) {
+  syscall(SYS_EXIT, (void *)status, 0, 0, 0, 0);
+}
diff --git a/userland/libc/unistd/chdir.c b/userland/libc/unistd/chdir.c
index 90b30ae..61372c0 100644
--- a/userland/libc/unistd/chdir.c
+++ b/userland/libc/unistd/chdir.c
@@ -1,4 +1,6 @@
-#include <unistd.h>
 #include <syscall.h>
+#include <unistd.h>
 
-int chdir(const char *path) { RC_ERRNO(syscall(SYS_CHDIR, path, 0, 0, 0, 0)); }
+int chdir(const char *path) {
+  RC_ERRNO(syscall(SYS_CHDIR, path, 0, 0, 0, 0));
+}
diff --git a/userland/libc/unistd/getpid.c b/userland/libc/unistd/getpid.c
index 8aeef10..47f9e71 100644
--- a/userland/libc/unistd/getpid.c
+++ b/userland/libc/unistd/getpid.c
@@ -1,7 +1,7 @@
-#include <unistd.h>
-#include <syscall.h>
 #include <sys/types.h>
+#include <syscall.h>
+#include <unistd.h>
 
 pid_t getpid(void) {
-    return s_syscall(SYS_GETPID);
+  return s_syscall(SYS_GETPID);
 }
diff --git a/userland/libc/unistd/isatty.c b/userland/libc/unistd/isatty.c
index d8b08c3..55cf4e7 100644
--- a/userland/libc/unistd/isatty.c
+++ b/userland/libc/unistd/isatty.c
@@ -1,11 +1,12 @@
+#include <errno.h>
 #include <syscall.h>
 #include <unistd.h>
-#include <errno.h>
 
 int isatty(int fd) {
   int rc = syscall(SYS_ISATTY, fd, 0, 0, 0, 0);
-  if (1 == rc)
+  if (1 == rc) {
     return rc;
+  }
   errno = -rc;
   return 0;
 }
diff --git a/userland/libc/unistd/msleep.c b/userland/libc/unistd/msleep.c
index 0b016c6..1f70a7b 100644
--- a/userland/libc/unistd/msleep.c
+++ b/userland/libc/unistd/msleep.c
@@ -1,6 +1,8 @@
 // Not standard, but it feels like it should be.
+#include <stdint.h>
 #include <syscall.h>
 #include <unistd.h>
-#include <stdint.h>
 
-void msleep(uint32_t ms) { syscall(SYS_MSLEEP, (void *)ms, 0, 0, 0, 0); }
+void msleep(uint32_t ms) {
+  syscall(SYS_MSLEEP, (void *)ms, 0, 0, 0, 0);
+}
diff --git a/userland/libc/unistd/unlink.c b/userland/libc/unistd/unlink.c
index 7d7aa1c..f26539a 100644
--- a/userland/libc/unistd/unlink.c
+++ b/userland/libc/unistd/unlink.c
@@ -1,5 +1,5 @@
-#include <unistd.h>
 #include <stdio.h>
+#include <unistd.h>
 
 int unlink(const char *path) {
   // TODO
diff --git a/userland/libc/unistd/uptime.c b/userland/libc/unistd/uptime.c
index 090a0e5..5a0654f 100644
--- a/userland/libc/unistd/uptime.c
+++ b/userland/libc/unistd/uptime.c
@@ -3,4 +3,6 @@
 #include <syscall.h>
 #include <unistd.h>
 
-uint32_t uptime(void) { return syscall(SYS_UPTIME, 0, 0, 0, 0, 0); }
+uint32_t uptime(void) {
+  return syscall(SYS_UPTIME, 0, 0, 0, 0, 0);
+}
diff --git a/userland/libc/unistd/write.c b/userland/libc/unistd/write.c
index 0dd1824..82e29fd 100644
--- a/userland/libc/unistd/write.c
+++ b/userland/libc/unistd/write.c
@@ -1,6 +1,6 @@
+#include <errno.h>
 #include <syscall.h>
 #include <unistd.h>
-#include <errno.h>
 
 int write(int fd, const char *buf, size_t count) {
   RC_ERRNO(syscall(SYS_WRITE, fd, buf, count, 0, 0));
diff --git a/userland/libppm/Makefile b/userland/libppm/Makefile
index 405e1dd..029e51e 100644
--- a/userland/libppm/Makefile
+++ b/userland/libppm/Makefile
@@ -6,6 +6,7 @@ BINS=ppm
 all: $(BINS)
 
 ppm.o: ppm.c
+	clang-format -i $<
 	$(CC) $(CFLAGS) $(INC) $(LIB) -o $@ -c $<
 
 ppm: ppm.o
diff --git a/userland/libppm/ppm.c b/userland/libppm/ppm.c
index 9f5bac5..2520d69 100644
--- a/userland/libppm/ppm.c
+++ b/userland/libppm/ppm.c
@@ -88,8 +88,9 @@ int load_ppm6_file(FILE *fp, const struct PPM_IMAGE *img, uint32_t buf_width,
   uint8_t *rgb = malloc(3 * n_pixels);
 
   const int rc = fread(rgb, 3, n_pixels, fp);
-  if (0 == rc)
+  if (0 == rc) {
     return 0;
+  }
 
   uint32_t *p = rgb;
   u32 buf_size = buf_height * buf_width;
@@ -149,8 +150,9 @@ int load_ppm3_file(FILE *fp, const struct PPM_IMAGE *img, uint32_t buf_width,
     int green;
     int blue;
     int rc = fscanf(fp, "%d %d %d", &red, &green, &blue);
-    if (0 == rc)
+    if (0 == rc) {
       break;
+    }
     red &= 0xFF;
     green &= 0xFF;
     blue &= 0xFF;
@@ -175,10 +177,11 @@ int load_ppm3_file(FILE *fp, const struct PPM_IMAGE *img, uint32_t buf_width,
 
 int load_ppm_file(FILE *fp, const struct PPM_IMAGE *img, uint32_t buf_width,
                   uint32_t buf_height, uint32_t *buffer) {
-  if (3 == img->version)
+  if (3 == img->version) {
     return load_ppm3_file(fp, img, buf_width, buf_height, buffer);
-  else if (6 == img->version)
+  } else if (6 == img->version) {
     return load_ppm6_file(fp, img, buf_width, buf_height, buffer);
+  }
   return 0;
 }
 
diff --git a/userland/minibox/Makefile b/userland/minibox/Makefile
index a9e7234..f0332f3 100644
--- a/userland/minibox/Makefile
+++ b/userland/minibox/Makefile
@@ -3,6 +3,7 @@ CFLAGS=-Wall -Wextra -pedantic -Wimplicit-fallthrough -g -O0
 OBJ=minibox.o utilities/cat.o utilities/echo.o utilities/yes.o utilities/minibox.o utilities/ascii.o utilities/wc.o utilities/init.o utilities/ls.o utilities/touch.o utilities/ed.o utilities/sh/sh.o utilities/sh/lexer.o utilities/sh/ast.o utilities/kill.o utilities/sha1sum.o utilities/rdate.o utilities/true.o utilities/false.o utilities/lock.o
 
 %.o: %.c
+	clang-format -i $<
 	$(CC) $(CFLAGS) $(INCLUDE) $(LIBS) -c $< -o $@
 
 minibox: $(OBJ)
diff --git a/userland/minibox/minibox.c b/userland/minibox/minibox.c
index 9d7ea0c..4d02fb2 100644
--- a/userland/minibox/minibox.c
+++ b/userland/minibox/minibox.c
@@ -22,13 +22,16 @@ Command utilities[] = {COMMAND(minibox), COMMAND(ascii), COMMAND(echo),
                        COMMAND(cat),     COMMAND(yes),   COMMAND(wc),
                        COMMAND(init),    COMMAND(ls),    COMMAND(touch),
                        COMMAND(ed),      COMMAND(sh),    COMMAND(kill),
-                       COMMAND(sha1sum), COMMAND(rdate), COMMAND(true), COMMAND(false), COMMAND(lock)};
+                       COMMAND(sha1sum), COMMAND(rdate), COMMAND(true),
+                       COMMAND(false),   COMMAND(lock)};
 
 char *parse_filename(char *str) {
   char *tmp = NULL, *is = str;
-  for (; *is++;)
-    if ('/' == *is)
+  for (; *is++;) {
+    if ('/' == *is) {
       tmp = is;
+    }
+  }
   return tmp ? tmp + 1 : str;
 }
 
@@ -40,8 +43,9 @@ void usage(void) {
 }
 
 int main(int argc, char **argv) {
-  if (argc < 1)
+  if (argc < 1) {
     return 1;
+  }
 #ifdef SINGLE_MAIN
   return utilities[0].function(argc, argv);
 #endif
@@ -54,11 +58,14 @@ int main(int argc, char **argv) {
   //       to be ran like "minibox <utility> <arguments>" or
   //       even "minibox minibox <utility> <arguments>"
   const char *utility_name = parse_filename(argv[0]);
-  if (*utility_name == '/')
+  if (*utility_name == '/') {
     utility_name++;
-  for (int i = 0; i < ARRAY_LENGTH(utilities); i++)
-    if (0 == strcmp(utility_name, utilities[i].name))
+  }
+  for (int i = 0; i < ARRAY_LENGTH(utilities); i++) {
+    if (0 == strcmp(utility_name, utilities[i].name)) {
       return utilities[i].function(argc, argv);
+    }
+  }
 
   usage();
   return 0;
diff --git a/userland/minibox/utilities/ascii.c b/userland/minibox/utilities/ascii.c
index 53429dc..d60132a 100644
--- a/userland/minibox/utilities/ascii.c
+++ b/userland/minibox/utilities/ascii.c
@@ -1,30 +1,46 @@
 #include <stdio.h>
 
-const char * const ascii_table[] =
-{
-"Dec Hex    Dec Hex    Dec Hex  Dec Hex  Dec Hex  Dec Hex   Dec Hex   Dec Hex",
-"  0 00 NUL  16 10 DLE  32 20    48 30 0  64 40 @  80 50 P   96 60 `  112 70 p",
-"  1 01 SOH  17 11 DC1  33 21 !  49 31 1  65 41 A  81 51 Q   97 61 a  113 71 q",
-"  2 02 STX  18 12 DC2  34 22 \"  50 32 2  66 42 B  82 52 R   98 62 b  114 72 r",
-"  3 03 ETX  19 13 DC3  35 23 #  51 33 3  67 43 C  83 53 S   99 63 c  115 73 s",
-"  4 04 EOT  20 14 DC4  36 24 $  52 34 4  68 44 D  84 54 T  100 64 d  116 74 t",
-"  5 05 ENQ  21 15 NAK  37 25 %  53 35 5  69 45 E  85 55 U  101 65 e  117 75 u",
-"  6 06 ACK  22 16 SYN  38 26 &  54 36 6  70 46 F  86 56 V  102 66 f  118 76 v",
-"  7 07 BEL  23 17 ETB  39 27 '  55 37 7  71 47 G  87 57 W  103 67 g  119 77 w",
-"  8 08 BS   24 18 CAN  40 28 (  56 38 8  72 48 H  88 58 X  104 68 h  120 78 x",
-"  9 09 HT   25 19 EM   41 29 )  57 39 9  73 49 I  89 59 Y  105 69 i  121 79 y",
-" 10 0A LF   26 1A SUB  42 2A *  58 3A :  74 4A J  90 5A Z  106 6A j  122 7A z",
-" 11 0B VT   27 1B ESC  43 2B +  59 3B ;  75 4B K  91 5B [  107 6B k  123 7B {",
-" 12 0C FF   28 1C FS   44 2C ,  60 3C <  76 4C L  92 5C \\  108 6C l  124 7C |",
-" 13 0D CR   29 1D GS   45 2D -  61 3D =  77 4D M  93 5D ]  109 6D m  125 7D }",
-" 14 0E SO   30 1E RS   46 2E .  62 3E >  78 4E N  94 5E ^  110 6E n  126 7E ~",
-" 15 0F SI   31 1F US   47 2F /  63 3F ?  79 4F O  95 5F _  111 6F o  127 7F DEL",
+const char *const ascii_table[] = {
+    "Dec Hex    Dec Hex    Dec Hex  Dec Hex  Dec Hex  Dec Hex   Dec Hex   Dec "
+    "Hex",
+    "  0 00 NUL  16 10 DLE  32 20    48 30 0  64 40 @  80 50 P   96 60 `  112 "
+    "70 p",
+    "  1 01 SOH  17 11 DC1  33 21 !  49 31 1  65 41 A  81 51 Q   97 61 a  113 "
+    "71 q",
+    "  2 02 STX  18 12 DC2  34 22 \"  50 32 2  66 42 B  82 52 R   98 62 b  114 "
+    "72 r",
+    "  3 03 ETX  19 13 DC3  35 23 #  51 33 3  67 43 C  83 53 S   99 63 c  115 "
+    "73 s",
+    "  4 04 EOT  20 14 DC4  36 24 $  52 34 4  68 44 D  84 54 T  100 64 d  116 "
+    "74 t",
+    "  5 05 ENQ  21 15 NAK  37 25 %  53 35 5  69 45 E  85 55 U  101 65 e  117 "
+    "75 u",
+    "  6 06 ACK  22 16 SYN  38 26 &  54 36 6  70 46 F  86 56 V  102 66 f  118 "
+    "76 v",
+    "  7 07 BEL  23 17 ETB  39 27 '  55 37 7  71 47 G  87 57 W  103 67 g  119 "
+    "77 w",
+    "  8 08 BS   24 18 CAN  40 28 (  56 38 8  72 48 H  88 58 X  104 68 h  120 "
+    "78 x",
+    "  9 09 HT   25 19 EM   41 29 )  57 39 9  73 49 I  89 59 Y  105 69 i  121 "
+    "79 y",
+    " 10 0A LF   26 1A SUB  42 2A *  58 3A :  74 4A J  90 5A Z  106 6A j  122 "
+    "7A z",
+    " 11 0B VT   27 1B ESC  43 2B +  59 3B ;  75 4B K  91 5B [  107 6B k  123 "
+    "7B {",
+    " 12 0C FF   28 1C FS   44 2C ,  60 3C <  76 4C L  92 5C \\  108 6C l  124 "
+    "7C |",
+    " 13 0D CR   29 1D GS   45 2D -  61 3D =  77 4D M  93 5D ]  109 6D m  125 "
+    "7D }",
+    " 14 0E SO   30 1E RS   46 2E .  62 3E >  78 4E N  94 5E ^  110 6E n  126 "
+    "7E ~",
+    " 15 0F SI   31 1F US   47 2F /  63 3F ?  79 4F O  95 5F _  111 6F o  127 "
+    "7F DEL",
 };
 
-int ascii_main(int argc, char ** argv)
-{
-	for(int i = 0;i < sizeof(ascii_table)/sizeof(ascii_table[0]);i++)
-		puts(ascii_table[i]);
+int ascii_main(int argc, char **argv) {
+  for (int i = 0; i < sizeof(ascii_table) / sizeof(ascii_table[0]); i++) {
+    puts(ascii_table[i]);
+  }
 
-	return 0;
+  return 0;
 }
diff --git a/userland/minibox/utilities/cat.c b/userland/minibox/utilities/cat.c
index 736aee6..a425392 100644
--- a/userland/minibox/utilities/cat.c
+++ b/userland/minibox/utilities/cat.c
@@ -13,10 +13,12 @@
 int fd_to_stdout(int fd) {
   int rc;
   for (char buffer[CAT_BUFFER]; (rc = read(fd, &buffer, sizeof(buffer)));) {
-    if (-1 == rc)
+    if (-1 == rc) {
       return 0;
-    if (-1 == write(fd_stdout, buffer, rc))
+    }
+    if (-1 == write(fd_stdout, buffer, rc)) {
       return 0;
+    }
   }
   return 1;
 }
@@ -35,8 +37,9 @@ int cat_main(int argc, char **argv) {
     // If a file is '-', the cat utility shall read from the standard
     // input at that point in the sequence.
     if (0 == strcmp(*argv, "-")) {
-      if (!fd_to_stdout(0))
+      if (!fd_to_stdout(0)) {
         return 1;
+      }
       continue;
     }
 
@@ -46,8 +49,9 @@ int cat_main(int argc, char **argv) {
       perror(*argv);
       return 1;
     }
-    if (!fd_to_stdout(fd))
+    if (!fd_to_stdout(fd)) {
       return 1;
+    }
     close(fd);
   }
   return 0;
diff --git a/userland/minibox/utilities/echo.c b/userland/minibox/utilities/echo.c
index 5ec68a7..f184d4a 100644
--- a/userland/minibox/utilities/echo.c
+++ b/userland/minibox/utilities/echo.c
@@ -7,24 +7,27 @@
 int echo(char **str, int new_line) {
   for (; *str;) {
     printf("%s", *str);
-    if (*++str)
+    if (*++str) {
       putchar(' ');
+    }
   }
 
-  if (new_line)
+  if (new_line) {
     putchar('\n');
+  }
   return 0;
 }
 
 int echo_main(int argc, char **argv) {
   int new_line = 1;
 
-  for (; *++argv && '-' == **argv;)
+  for (; *++argv && '-' == **argv;) {
     switch (*(*argv + 1)) {
     case 'n':
       new_line = 0;
       break;
     }
+  }
 
   return echo(argv, new_line);
 }
diff --git a/userland/minibox/utilities/ed.c b/userland/minibox/utilities/ed.c
index bcaba36..b60689d 100644
--- a/userland/minibox/utilities/ed.c
+++ b/userland/minibox/utilities/ed.c
@@ -21,8 +21,9 @@ int ed_getline(char *buffer, size_t s) {
     assert(rc > 0);
     printf("%c", c);
     buffer[i] = c;
-    if ('\n' == c)
+    if ('\n' == c) {
       break;
+    }
   }
   buffer[i] = '\0';
   return i;
@@ -35,10 +36,12 @@ void goto_line(void) {
   if (1 != line_number) {
     // Goto line
     for (; fread(&c, 1, 1, mem_fp);) {
-      if ('\n' == c)
+      if ('\n' == c) {
         line++;
-      if (line == line_number)
+      }
+      if (line == line_number) {
         return;
+      }
     }
     printf("got to line: %d\n", line);
     assert(0);
@@ -49,8 +52,9 @@ void read_line(void) {
   char c;
   goto_line();
   for (; fread(&c, 1, 1, mem_fp);) {
-    if ('\n' == c)
+    if ('\n' == c) {
       break;
+    }
     printf("%c", c);
   }
   printf("\n");
@@ -59,8 +63,9 @@ void read_line(void) {
 void goto_end_of_line(void) {
   char c;
   for (; fread(&c, 1, 1, mem_fp);) {
-    if ('\n' == c)
+    if ('\n' == c) {
       break;
+    }
   }
 }
 
@@ -74,8 +79,9 @@ void delete_line(void) {
   for (char buffer[4096];;) {
     int rc = fread(buffer, 1, 100, mem_fp);
     long reset = ftell(mem_fp);
-    if (0 == rc)
+    if (0 == rc) {
       break;
+    }
     fseek(mem_fp, s, SEEK_SET);
     fwrite(buffer, 1, rc, mem_fp);
     s += rc;
@@ -120,8 +126,9 @@ void read_input(void) {
 }
 
 int ed_main(char argc, char **argv) {
-  if (argc < 2)
+  if (argc < 2) {
     return 1;
+  }
   char *buffer;
   size_t size;
   mem_fp = open_memstream(&buffer, &size);
@@ -134,10 +141,11 @@ int ed_main(char argc, char **argv) {
   }
 
   for (;;) {
-    if (COMMAND_MODE == mode)
+    if (COMMAND_MODE == mode) {
       read_command();
-    else
+    } else {
       read_input();
+    }
   }
   fclose(fp);
   fclose(mem_fp);
diff --git a/userland/minibox/utilities/init.c b/userland/minibox/utilities/init.c
index ce65387..b5aaf56 100644
--- a/userland/minibox/utilities/init.c
+++ b/userland/minibox/utilities/init.c
@@ -45,8 +45,9 @@ void shell() {
       char c[4096];
       int rc = read(fds[0].fd, c, 4096);
       assert(rc > 0);
-      for (int i = 0; i < rc; i++)
+      for (int i = 0; i < rc; i++) {
         putchar(c[i]);
+      }
     }
     if (fds[1].revents & POLLIN) {
       char c;
diff --git a/userland/minibox/utilities/ls.c b/userland/minibox/utilities/ls.c
index 5a8f8ea..4ce952d 100644
--- a/userland/minibox/utilities/ls.c
+++ b/userland/minibox/utilities/ls.c
@@ -35,14 +35,17 @@ int ls_main(int argc, char **argv) {
 
   int prev = 0;
   for (int i = 0; i < n; i++) {
-    if (!list_hidden)
-      if ('.' == *namelist[i]->d_name)
+    if (!list_hidden) {
+      if ('.' == *namelist[i]->d_name) {
         continue;
+      }
+    }
 
-    if (prev)
+    if (prev) {
       putchar(newline ? '\n' : ' ');
-    else
+    } else {
       prev = 1;
+    }
     printf("%s", namelist[i]->d_name);
   }
   putchar('\n');
diff --git a/userland/minibox/utilities/minibox.c b/userland/minibox/utilities/minibox.c
index ec5fdbd..f412efc 100644
--- a/userland/minibox/utilities/minibox.c
+++ b/userland/minibox/utilities/minibox.c
@@ -6,8 +6,9 @@ int main(int argc, char **argv);
 // Should a command be called via "minibox <command> <arguments>" then shift
 // argv and argc to become "<command> <arguments>" and rerun main()
 int minibox_main(int argc, char **argv) {
-  if (argc < 2)
+  if (argc < 2) {
     usage();
+  }
 
   argc--;
   argv++;
diff --git a/userland/minibox/utilities/sh/ast.c b/userland/minibox/utilities/sh/ast.c
index 2b9c151..2a8d775 100644
--- a/userland/minibox/utilities/sh/ast.c
+++ b/userland/minibox/utilities/sh/ast.c
@@ -11,8 +11,9 @@ void free_ast_command(struct AST *ast) {
 
 void free_ast(struct AST *ast) {
   for (; ast;) {
-    if (AST_COMMAND == ast->type)
+    if (AST_COMMAND == ast->type) {
       free_ast_command(ast);
+    }
     struct AST *old = ast;
     ast = ast->next;
     free(old);
@@ -27,8 +28,9 @@ struct AST *allocate_ast(void) {
 
 int parse_command(struct TOKEN **token_ptr, struct AST *cur) {
   struct TOKEN *token = *token_ptr;
-  if (TOKEN_CHARS != token->type)
+  if (TOKEN_CHARS != token->type) {
     return 0;
+  }
   cur->type = AST_COMMAND;
   cur->val.type = AST_VALUE_STRING;
   cur->val.string = token->string_rep;
@@ -41,10 +43,12 @@ int parse_command(struct TOKEN **token_ptr, struct AST *cur) {
       child->type = AST_EXPRESSION;
       child->val.type = AST_VALUE_STRING;
       child->val.string = token->string_rep;
-      if (!token->next)
+      if (!token->next) {
         break;
-      if (TOKEN_CHARS != token->next->type)
+      }
+      if (TOKEN_CHARS != token->next->type) {
         break;
+      }
       token = token->next;
       child->next = allocate_ast();
       child = child->next;
@@ -87,8 +91,9 @@ struct AST *generate_ast(struct TOKEN *token) {
   struct AST *prev = NULL;
   for (; token;) {
     struct AST *cur = allocate_ast();
-    if (prev)
+    if (prev) {
       prev->next = cur;
+    }
     if (parse_command(&token, cur)) {
     } else if (TOKEN_AND == token->type) {
       cur->type = AST_CONDITIONAL_AND;
@@ -99,8 +104,9 @@ struct AST *generate_ast(struct TOKEN *token) {
     } else {
       token = token->next;
     }
-    if (!head)
+    if (!head) {
       head = cur;
+    }
     prev = cur;
   }
   return head;
diff --git a/userland/minibox/utilities/sh/lexer.c b/userland/minibox/utilities/sh/lexer.c
index d7f00c7..09fc2ff 100644
--- a/userland/minibox/utilities/sh/lexer.c
+++ b/userland/minibox/utilities/sh/lexer.c
@@ -15,19 +15,23 @@ void free_tokens(struct TOKEN *token) {
 }
 
 int is_special_char(char c) {
-  if (!isprint(c))
+  if (!isprint(c)) {
     return 1;
-  if (isspace(c))
+  }
+  if (isspace(c)) {
     return 1;
-  if (isalnum(c))
+  }
+  if (isalnum(c)) {
     return 0;
+  }
   return !(('>' != c && '|' != c && '&' != c));
 }
 
 int parse_chars(struct sv *code_ptr, struct TOKEN *cur) {
   struct sv code = *code_ptr;
-  if (is_special_char(sv_peek(code)))
+  if (is_special_char(sv_peek(code))) {
     return 0;
+  }
   cur->type = TOKEN_CHARS;
   cur->string_rep = sv_split_function(code, &code, is_special_char);
   *code_ptr = code;
@@ -83,16 +87,18 @@ struct TOKEN *lex(struct sv code) {
 
     struct TOKEN *cur = malloc(sizeof(struct TOKEN));
     cur->next = NULL;
-    if (prev)
+    if (prev) {
       prev->next = cur;
+    }
     if (parse_chars(&code, cur)) {
     } else if (parse_operand(&code, cur)) {
     } else {
       free(cur);
       assert(0 && "Unknown token");
     }
-    if (!head)
+    if (!head) {
       head = cur;
+    }
     prev = cur;
   }
   return head;
diff --git a/userland/minibox/utilities/sh/sh.c b/userland/minibox/utilities/sh/sh.c
index b00b440..3643d99 100644
--- a/userland/minibox/utilities/sh/sh.c
+++ b/userland/minibox/utilities/sh/sh.c
@@ -68,8 +68,9 @@ int execute_binary(struct AST *ast, int input_fd) {
   }
 
   if (ast->pipe_rhs) {
-    if (out >= 0)
+    if (out >= 0) {
       close(out);
+    }
     return execute_command(ast->pipe_rhs, slave_input);
   }
 
@@ -135,14 +136,16 @@ void execute_ast(struct AST *ast) {
     } else if (AST_CONDITIONAL_AND == ast->type) {
       if (0 != rc) {
         ast = ast->next;
-        if (!ast)
+        if (!ast) {
           break;
+        }
       }
     } else if (AST_CONDITIONAL_NOT == ast->type) {
       if (0 == rc) {
         ast = ast->next;
-        if (!ast)
+        if (!ast) {
           break;
+        }
       }
     }
     ast = ast->next;
diff --git a/userland/minibox/utilities/touch.c b/userland/minibox/utilities/touch.c
index dd2f072..c9236e2 100644
--- a/userland/minibox/utilities/touch.c
+++ b/userland/minibox/utilities/touch.c
@@ -2,8 +2,9 @@
 #include <fcntl.h>
 
 int touch_main(int argc, char **argv) {
-  if (argc < 2)
+  if (argc < 2) {
     return 1;
+  }
   int fd;
   COND_PERROR_EXP(open(argv[1], O_CREAT, 0), "open", return 1)
   close(fd);
diff --git a/userland/minibox/utilities/wc.c b/userland/minibox/utilities/wc.c
index 886eb9e..27a214b 100644
--- a/userland/minibox/utilities/wc.c
+++ b/userland/minibox/utilities/wc.c
@@ -1,106 +1,117 @@
+#include "include.h"
+#include <ctype.h>
+#include <fcntl.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include "include.h"
+#include <unistd.h>
 
 int cmode, wmode, lmode;
 
-void output(const char * str, size_t lines, size_t words, size_t chars)
-{
-	if(lmode)
-		printf("%d", lines);
+void output(const char *str, size_t lines, size_t words, size_t chars) {
+  if (lmode) {
+    printf("%d", lines);
+  }
 
-	if(wmode)
-	{
-		if(lmode) putchar(' ');
+  if (wmode) {
+    if (lmode) {
+      putchar(' ');
+    }
 
-		printf("%d", words);
-	}
+    printf("%d", words);
+  }
 
-	if(cmode)
-	{
-		if(lmode) putchar(' ');
+  if (cmode) {
+    if (lmode) {
+      putchar(' ');
+    }
 
-		printf("%d", chars);
-	}
+    printf("%d", chars);
+  }
 
-	if(str) printf(" %s", str);
+  if (str) {
+    printf(" %s", str);
+  }
 
-	putchar('\n');
+  putchar('\n');
 }
 
-void wc(int argc, char ** argv)
-{
-	int fd = fd_stdin;
-	size_t total_chars, total_words, total_lines;
-	total_chars = total_words = total_lines = 0;
-
-	if(NULL == *argv)
-		goto read_stdin;
-
-
-	for(;*argv;argv++)
-	{
-        int new_word = 1;
-		size_t chars = 0,
-				words = chars,
-				lines = chars;
-
-		fd = open(*argv, O_RDONLY, 0);
-read_stdin:
-		for(char c;read(fd, &c, 1);)
-		{
-			if(cmode)
-				chars++;
-
-			if(wmode)
-			{
-                if(isspace(c)) {
-                    new_word = 1;
-                } else if(new_word) {
-                    words++;
-                    new_word = 0;
-                }
-			}
-
-			if(lmode)
-				if('\n' == c)
-					lines++;
-		}
-		close(fd);
-		if(lmode) total_lines += lines;
-		if(wmode) total_words += words;
-		if(cmode) total_chars += chars;
-
-		output(*argv, lines, words, chars);
-		if(NULL == *argv) return; // We read from stdin
-	}
-
-	if(argc > 1) output("total", total_lines, total_words, total_chars);
+void wc(int argc, char **argv) {
+  int fd = fd_stdin;
+  size_t total_chars, total_words, total_lines;
+  total_chars = total_words = total_lines = 0;
+
+  if (NULL == *argv) {
+    goto read_stdin;
+  }
+
+  for (; *argv; argv++) {
+    int new_word = 1;
+    size_t chars = 0, words = chars, lines = chars;
+
+    fd = open(*argv, O_RDONLY, 0);
+  read_stdin:
+    for (char c; read(fd, &c, 1);) {
+      if (cmode) {
+        chars++;
+      }
+
+      if (wmode) {
+        if (isspace(c)) {
+          new_word = 1;
+        } else if (new_word) {
+          words++;
+          new_word = 0;
+        }
+      }
+
+      if (lmode) {
+        if ('\n' == c) {
+          lines++;
+        }
+      }
+    }
+    close(fd);
+    if (lmode) {
+      total_lines += lines;
+    }
+    if (wmode) {
+      total_words += words;
+    }
+    if (cmode) {
+      total_chars += chars;
+    }
+
+    output(*argv, lines, words, chars);
+    if (NULL == *argv) {
+      return; // We read from stdin
+    }
+  }
+
+  if (argc > 1) {
+    output("total", total_lines, total_words, total_chars);
+  }
 }
 
-int wc_main(int argc, char ** argv)
-{
-	cmode = wmode = lmode = 0;
-	for(argc--;*++argv && '-' == **argv;argc--)
-		switch(*(*argv+1))
-		{
-		case 'l':
-			lmode = 1;
-			break;
-		case 'w':
-			wmode = 1;
-			break;
-		case 'c':
-			cmode = 1;
-			break;
-		}
-
-	if(!(lmode || cmode || wmode))
-		cmode = wmode = lmode = 1;
-
-	wc(argc, argv);
-	return 0;
+int wc_main(int argc, char **argv) {
+  cmode = wmode = lmode = 0;
+  for (argc--; *++argv && '-' == **argv; argc--) {
+    switch (*(*argv + 1)) {
+    case 'l':
+      lmode = 1;
+      break;
+    case 'w':
+      wmode = 1;
+      break;
+    case 'c':
+      cmode = 1;
+      break;
+    }
+  }
+
+  if (!(lmode || cmode || wmode)) {
+    cmode = wmode = lmode = 1;
+  }
+
+  wc(argc, argv);
+  return 0;
 }
diff --git a/userland/minibox/utilities/yes.c b/userland/minibox/utilities/yes.c
index ff19004..c0c43c8 100644
--- a/userland/minibox/utilities/yes.c
+++ b/userland/minibox/utilities/yes.c
@@ -2,12 +2,16 @@
 #include <stdio.h>
 
 int yes_main(int argc, char **argv) {
-  if (argc < 2)
-    for (;;)
+  if (argc < 2) {
+    for (;;) {
       puts("y");
+    }
+  }
 
-  for (;; putchar('\n'))
-    for (int i = 1; i < argc; i++)
+  for (;; putchar('\n')) {
+    for (int i = 1; i < argc; i++) {
       printf("%s ", argv[i]);
+    }
+  }
   return 0;
 }
diff --git a/userland/terminal/Makefile b/userland/terminal/Makefile
index d88aba6..6a1bffe 100644
--- a/userland/terminal/Makefile
+++ b/userland/terminal/Makefile
@@ -6,6 +6,7 @@ BINS=term
 all: $(BINS)
 
 term.o: term.c
+	clang-format -i $<
 	$(CC) $(CFLAGS) $(INC) $(LIB) -o $@ -c $<
 
 term: term.o
diff --git a/userland/windowserver/Makefile b/userland/windowserver/Makefile
index e6afb22..22e09f3 100644
--- a/userland/windowserver/Makefile
+++ b/userland/windowserver/Makefile
@@ -8,6 +8,7 @@ all: $(BIN)
 OBJ=ws.o draw.o
 
 %.o: %.c
+	clang-format -i $<
 	$(CC) $(CFLAGS) $(INC) $(LIB) -o $@ -c $<
 
 clean:
diff --git a/userland/windowserver/draw.c b/userland/windowserver/draw.c
index dd80ad1..ce315ea 100644
--- a/userland/windowserver/draw.c
+++ b/userland/windowserver/draw.c
@@ -31,8 +31,9 @@ void draw_line(DISPLAY *disp, int sx, int sy, int dx, int dy, uint32_t color) {
   int y = sy;
   for (;;) {
     // Bounds checking
-    if (y * disp->width + x > disp->height * disp->width)
+    if (y * disp->width + x > disp->height * disp->width) {
       break;
+    }
 
     if (x >= dx - 1 && y >= dy - 1) {
       break;
diff --git a/userland/windowserver/draw.h b/userland/windowserver/draw.h
index fe78bc1..e25f4aa 100644
--- a/userland/windowserver/draw.h
+++ b/userland/windowserver/draw.h
@@ -15,5 +15,6 @@ void draw_line(DISPLAY *disp, int sx, int sy, int dx, int dy, uint32_t color);
 void draw_wallpaper(const DISPLAY *disp);
 void draw_rectangle(DISPLAY *disp, int x, int y, int sx, int sy,
                     uint32_t color);
-void draw_outline(DISPLAY *disp, int x, int y, int sx, int sy, int border_px, uint32_t color);
+void draw_outline(DISPLAY *disp, int x, int y, int sx, int sy, int border_px,
+                  uint32_t color);
 #endif
diff --git a/userland/windowserver/font.h b/userland/windowserver/font.h
index ad63e41..57a5475 100644
--- a/userland/windowserver/font.h
+++ b/userland/windowserver/font.h
@@ -1,133 +1,133 @@
 #ifndef FONT_H
 #define FONT_H
 char font8x8_basic[128][8] = {
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0000 (nul)
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0001
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0002
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0003
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0004
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0005
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0006
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0007
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0008
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0009
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+000A
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+000B
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+000C
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+000D
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+000E
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+000F
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0010
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0011
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0012
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0013
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0014
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0015
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0016
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0017
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0018
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0019
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+001A
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+001B
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+001C
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+001D
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+001E
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+001F
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0020 (space)
-    { 0x18, 0x3C, 0x3C, 0x18, 0x18, 0x00, 0x18, 0x00},   // U+0021 (!)
-    { 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0022 (")
-    { 0x36, 0x36, 0x7F, 0x36, 0x7F, 0x36, 0x36, 0x00},   // U+0023 (#)
-    { 0x0C, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x0C, 0x00},   // U+0024 ($)
-    { 0x00, 0x63, 0x33, 0x18, 0x0C, 0x66, 0x63, 0x00},   // U+0025 (%)
-    { 0x1C, 0x36, 0x1C, 0x6E, 0x3B, 0x33, 0x6E, 0x00},   // U+0026 (&)
-    { 0x06, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0027 (')
-    { 0x18, 0x0C, 0x06, 0x06, 0x06, 0x0C, 0x18, 0x00},   // U+0028 (()
-    { 0x06, 0x0C, 0x18, 0x18, 0x18, 0x0C, 0x06, 0x00},   // U+0029 ())
-    { 0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00},   // U+002A (*)
-    { 0x00, 0x0C, 0x0C, 0x3F, 0x0C, 0x0C, 0x00, 0x00},   // U+002B (+)
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x06},   // U+002C (,)
-    { 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00},   // U+002D (-)
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x00},   // U+002E (.)
-    { 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00},   // U+002F (/)
-    { 0x3E, 0x63, 0x73, 0x7B, 0x6F, 0x67, 0x3E, 0x00},   // U+0030 (0)
-    { 0x0C, 0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x3F, 0x00},   // U+0031 (1)
-    { 0x1E, 0x33, 0x30, 0x1C, 0x06, 0x33, 0x3F, 0x00},   // U+0032 (2)
-    { 0x1E, 0x33, 0x30, 0x1C, 0x30, 0x33, 0x1E, 0x00},   // U+0033 (3)
-    { 0x38, 0x3C, 0x36, 0x33, 0x7F, 0x30, 0x78, 0x00},   // U+0034 (4)
-    { 0x3F, 0x03, 0x1F, 0x30, 0x30, 0x33, 0x1E, 0x00},   // U+0035 (5)
-    { 0x1C, 0x06, 0x03, 0x1F, 0x33, 0x33, 0x1E, 0x00},   // U+0036 (6)
-    { 0x3F, 0x33, 0x30, 0x18, 0x0C, 0x0C, 0x0C, 0x00},   // U+0037 (7)
-    { 0x1E, 0x33, 0x33, 0x1E, 0x33, 0x33, 0x1E, 0x00},   // U+0038 (8)
-    { 0x1E, 0x33, 0x33, 0x3E, 0x30, 0x18, 0x0E, 0x00},   // U+0039 (9)
-    { 0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x00},   // U+003A (:)
-    { 0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x06},   // U+003B (;)
-    { 0x18, 0x0C, 0x06, 0x03, 0x06, 0x0C, 0x18, 0x00},   // U+003C (<)
-    { 0x00, 0x00, 0x3F, 0x00, 0x00, 0x3F, 0x00, 0x00},   // U+003D (=)
-    { 0x06, 0x0C, 0x18, 0x30, 0x18, 0x0C, 0x06, 0x00},   // U+003E (>)
-    { 0x1E, 0x33, 0x30, 0x18, 0x0C, 0x00, 0x0C, 0x00},   // U+003F (?)
-    { 0x3E, 0x63, 0x7B, 0x7B, 0x7B, 0x03, 0x1E, 0x00},   // U+0040 (@)
-    { 0x0C, 0x1E, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x00},   // U+0041 (A)
-    { 0x3F, 0x66, 0x66, 0x3E, 0x66, 0x66, 0x3F, 0x00},   // U+0042 (B)
-    { 0x3C, 0x66, 0x03, 0x03, 0x03, 0x66, 0x3C, 0x00},   // U+0043 (C)
-    { 0x1F, 0x36, 0x66, 0x66, 0x66, 0x36, 0x1F, 0x00},   // U+0044 (D)
-    { 0x7F, 0x46, 0x16, 0x1E, 0x16, 0x46, 0x7F, 0x00},   // U+0045 (E)
-    { 0x7F, 0x46, 0x16, 0x1E, 0x16, 0x06, 0x0F, 0x00},   // U+0046 (F)
-    { 0x3C, 0x66, 0x03, 0x03, 0x73, 0x66, 0x7C, 0x00},   // U+0047 (G)
-    { 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, 0x00},   // U+0048 (H)
-    { 0x1E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00},   // U+0049 (I)
-    { 0x78, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E, 0x00},   // U+004A (J)
-    { 0x67, 0x66, 0x36, 0x1E, 0x36, 0x66, 0x67, 0x00},   // U+004B (K)
-    { 0x0F, 0x06, 0x06, 0x06, 0x46, 0x66, 0x7F, 0x00},   // U+004C (L)
-    { 0x63, 0x77, 0x7F, 0x7F, 0x6B, 0x63, 0x63, 0x00},   // U+004D (M)
-    { 0x63, 0x67, 0x6F, 0x7B, 0x73, 0x63, 0x63, 0x00},   // U+004E (N)
-    { 0x1C, 0x36, 0x63, 0x63, 0x63, 0x36, 0x1C, 0x00},   // U+004F (O)
-    { 0x3F, 0x66, 0x66, 0x3E, 0x06, 0x06, 0x0F, 0x00},   // U+0050 (P)
-    { 0x1E, 0x33, 0x33, 0x33, 0x3B, 0x1E, 0x38, 0x00},   // U+0051 (Q)
-    { 0x3F, 0x66, 0x66, 0x3E, 0x36, 0x66, 0x67, 0x00},   // U+0052 (R)
-    { 0x1E, 0x33, 0x07, 0x0E, 0x38, 0x33, 0x1E, 0x00},   // U+0053 (S)
-    { 0x3F, 0x2D, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00},   // U+0054 (T)
-    { 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x3F, 0x00},   // U+0055 (U)
-    { 0x33, 0x33, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00},   // U+0056 (V)
-    { 0x63, 0x63, 0x63, 0x6B, 0x7F, 0x77, 0x63, 0x00},   // U+0057 (W)
-    { 0x63, 0x63, 0x36, 0x1C, 0x1C, 0x36, 0x63, 0x00},   // U+0058 (X)
-    { 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x0C, 0x1E, 0x00},   // U+0059 (Y)
-    { 0x7F, 0x63, 0x31, 0x18, 0x4C, 0x66, 0x7F, 0x00},   // U+005A (Z)
-    { 0x1E, 0x06, 0x06, 0x06, 0x06, 0x06, 0x1E, 0x00},   // U+005B ([)
-    { 0x03, 0x06, 0x0C, 0x18, 0x30, 0x60, 0x40, 0x00},   // U+005C (\)
-    { 0x1E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1E, 0x00},   // U+005D (])
-    { 0x08, 0x1C, 0x36, 0x63, 0x00, 0x00, 0x00, 0x00},   // U+005E (^)
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF},   // U+005F (_)
-    { 0x0C, 0x0C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0060 (`)
-    { 0x00, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x6E, 0x00},   // U+0061 (a)
-    { 0x07, 0x06, 0x06, 0x3E, 0x66, 0x66, 0x3B, 0x00},   // U+0062 (b)
-    { 0x00, 0x00, 0x1E, 0x33, 0x03, 0x33, 0x1E, 0x00},   // U+0063 (c)
-    { 0x38, 0x30, 0x30, 0x3e, 0x33, 0x33, 0x6E, 0x00},   // U+0064 (d)
-    { 0x00, 0x00, 0x1E, 0x33, 0x3f, 0x03, 0x1E, 0x00},   // U+0065 (e)
-    { 0x1C, 0x36, 0x06, 0x0f, 0x06, 0x06, 0x0F, 0x00},   // U+0066 (f)
-    { 0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x1F},   // U+0067 (g)
-    { 0x07, 0x06, 0x36, 0x6E, 0x66, 0x66, 0x67, 0x00},   // U+0068 (h)
-    { 0x0C, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00},   // U+0069 (i)
-    { 0x30, 0x00, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E},   // U+006A (j)
-    { 0x07, 0x06, 0x66, 0x36, 0x1E, 0x36, 0x67, 0x00},   // U+006B (k)
-    { 0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00},   // U+006C (l)
-    { 0x00, 0x00, 0x33, 0x7F, 0x7F, 0x6B, 0x63, 0x00},   // U+006D (m)
-    { 0x00, 0x00, 0x1F, 0x33, 0x33, 0x33, 0x33, 0x00},   // U+006E (n)
-    { 0x00, 0x00, 0x1E, 0x33, 0x33, 0x33, 0x1E, 0x00},   // U+006F (o)
-    { 0x00, 0x00, 0x3B, 0x66, 0x66, 0x3E, 0x06, 0x0F},   // U+0070 (p)
-    { 0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x78},   // U+0071 (q)
-    { 0x00, 0x00, 0x3B, 0x6E, 0x66, 0x06, 0x0F, 0x00},   // U+0072 (r)
-    { 0x00, 0x00, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x00},   // U+0073 (s)
-    { 0x08, 0x0C, 0x3E, 0x0C, 0x0C, 0x2C, 0x18, 0x00},   // U+0074 (t)
-    { 0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x6E, 0x00},   // U+0075 (u)
-    { 0x00, 0x00, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00},   // U+0076 (v)
-    { 0x00, 0x00, 0x63, 0x6B, 0x7F, 0x7F, 0x36, 0x00},   // U+0077 (w)
-    { 0x00, 0x00, 0x63, 0x36, 0x1C, 0x36, 0x63, 0x00},   // U+0078 (x)
-    { 0x00, 0x00, 0x33, 0x33, 0x33, 0x3E, 0x30, 0x1F},   // U+0079 (y)
-    { 0x00, 0x00, 0x3F, 0x19, 0x0C, 0x26, 0x3F, 0x00},   // U+007A (z)
-    { 0x38, 0x0C, 0x0C, 0x07, 0x0C, 0x0C, 0x38, 0x00},   // U+007B ({)
-    { 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00},   // U+007C (|)
-    { 0x07, 0x0C, 0x0C, 0x38, 0x0C, 0x0C, 0x07, 0x00},   // U+007D (})
-    { 0x6E, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+007E (~)
-    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}    // U+007F
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0000 (nul)
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0001
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0002
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0003
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0004
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0005
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0006
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0007
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0008
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0009
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+000A
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+000B
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+000C
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+000D
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+000E
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+000F
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0010
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0011
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0012
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0013
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0014
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0015
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0016
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0017
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0018
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0019
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+001A
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+001B
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+001C
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+001D
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+001E
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+001F
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0020 (space)
+    {0x18, 0x3C, 0x3C, 0x18, 0x18, 0x00, 0x18, 0x00}, // U+0021 (!)
+    {0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0022 (")
+    {0x36, 0x36, 0x7F, 0x36, 0x7F, 0x36, 0x36, 0x00}, // U+0023 (#)
+    {0x0C, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x0C, 0x00}, // U+0024 ($)
+    {0x00, 0x63, 0x33, 0x18, 0x0C, 0x66, 0x63, 0x00}, // U+0025 (%)
+    {0x1C, 0x36, 0x1C, 0x6E, 0x3B, 0x33, 0x6E, 0x00}, // U+0026 (&)
+    {0x06, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0027 (')
+    {0x18, 0x0C, 0x06, 0x06, 0x06, 0x0C, 0x18, 0x00}, // U+0028 (()
+    {0x06, 0x0C, 0x18, 0x18, 0x18, 0x0C, 0x06, 0x00}, // U+0029 ())
+    {0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00}, // U+002A (*)
+    {0x00, 0x0C, 0x0C, 0x3F, 0x0C, 0x0C, 0x00, 0x00}, // U+002B (+)
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x06}, // U+002C (,)
+    {0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00}, // U+002D (-)
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x00}, // U+002E (.)
+    {0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00}, // U+002F (/)
+    {0x3E, 0x63, 0x73, 0x7B, 0x6F, 0x67, 0x3E, 0x00}, // U+0030 (0)
+    {0x0C, 0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x3F, 0x00}, // U+0031 (1)
+    {0x1E, 0x33, 0x30, 0x1C, 0x06, 0x33, 0x3F, 0x00}, // U+0032 (2)
+    {0x1E, 0x33, 0x30, 0x1C, 0x30, 0x33, 0x1E, 0x00}, // U+0033 (3)
+    {0x38, 0x3C, 0x36, 0x33, 0x7F, 0x30, 0x78, 0x00}, // U+0034 (4)
+    {0x3F, 0x03, 0x1F, 0x30, 0x30, 0x33, 0x1E, 0x00}, // U+0035 (5)
+    {0x1C, 0x06, 0x03, 0x1F, 0x33, 0x33, 0x1E, 0x00}, // U+0036 (6)
+    {0x3F, 0x33, 0x30, 0x18, 0x0C, 0x0C, 0x0C, 0x00}, // U+0037 (7)
+    {0x1E, 0x33, 0x33, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+0038 (8)
+    {0x1E, 0x33, 0x33, 0x3E, 0x30, 0x18, 0x0E, 0x00}, // U+0039 (9)
+    {0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x00}, // U+003A (:)
+    {0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x06}, // U+003B (;)
+    {0x18, 0x0C, 0x06, 0x03, 0x06, 0x0C, 0x18, 0x00}, // U+003C (<)
+    {0x00, 0x00, 0x3F, 0x00, 0x00, 0x3F, 0x00, 0x00}, // U+003D (=)
+    {0x06, 0x0C, 0x18, 0x30, 0x18, 0x0C, 0x06, 0x00}, // U+003E (>)
+    {0x1E, 0x33, 0x30, 0x18, 0x0C, 0x00, 0x0C, 0x00}, // U+003F (?)
+    {0x3E, 0x63, 0x7B, 0x7B, 0x7B, 0x03, 0x1E, 0x00}, // U+0040 (@)
+    {0x0C, 0x1E, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x00}, // U+0041 (A)
+    {0x3F, 0x66, 0x66, 0x3E, 0x66, 0x66, 0x3F, 0x00}, // U+0042 (B)
+    {0x3C, 0x66, 0x03, 0x03, 0x03, 0x66, 0x3C, 0x00}, // U+0043 (C)
+    {0x1F, 0x36, 0x66, 0x66, 0x66, 0x36, 0x1F, 0x00}, // U+0044 (D)
+    {0x7F, 0x46, 0x16, 0x1E, 0x16, 0x46, 0x7F, 0x00}, // U+0045 (E)
+    {0x7F, 0x46, 0x16, 0x1E, 0x16, 0x06, 0x0F, 0x00}, // U+0046 (F)
+    {0x3C, 0x66, 0x03, 0x03, 0x73, 0x66, 0x7C, 0x00}, // U+0047 (G)
+    {0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, 0x00}, // U+0048 (H)
+    {0x1E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+0049 (I)
+    {0x78, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E, 0x00}, // U+004A (J)
+    {0x67, 0x66, 0x36, 0x1E, 0x36, 0x66, 0x67, 0x00}, // U+004B (K)
+    {0x0F, 0x06, 0x06, 0x06, 0x46, 0x66, 0x7F, 0x00}, // U+004C (L)
+    {0x63, 0x77, 0x7F, 0x7F, 0x6B, 0x63, 0x63, 0x00}, // U+004D (M)
+    {0x63, 0x67, 0x6F, 0x7B, 0x73, 0x63, 0x63, 0x00}, // U+004E (N)
+    {0x1C, 0x36, 0x63, 0x63, 0x63, 0x36, 0x1C, 0x00}, // U+004F (O)
+    {0x3F, 0x66, 0x66, 0x3E, 0x06, 0x06, 0x0F, 0x00}, // U+0050 (P)
+    {0x1E, 0x33, 0x33, 0x33, 0x3B, 0x1E, 0x38, 0x00}, // U+0051 (Q)
+    {0x3F, 0x66, 0x66, 0x3E, 0x36, 0x66, 0x67, 0x00}, // U+0052 (R)
+    {0x1E, 0x33, 0x07, 0x0E, 0x38, 0x33, 0x1E, 0x00}, // U+0053 (S)
+    {0x3F, 0x2D, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+0054 (T)
+    {0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x3F, 0x00}, // U+0055 (U)
+    {0x33, 0x33, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00}, // U+0056 (V)
+    {0x63, 0x63, 0x63, 0x6B, 0x7F, 0x77, 0x63, 0x00}, // U+0057 (W)
+    {0x63, 0x63, 0x36, 0x1C, 0x1C, 0x36, 0x63, 0x00}, // U+0058 (X)
+    {0x33, 0x33, 0x33, 0x1E, 0x0C, 0x0C, 0x1E, 0x00}, // U+0059 (Y)
+    {0x7F, 0x63, 0x31, 0x18, 0x4C, 0x66, 0x7F, 0x00}, // U+005A (Z)
+    {0x1E, 0x06, 0x06, 0x06, 0x06, 0x06, 0x1E, 0x00}, // U+005B ([)
+    {0x03, 0x06, 0x0C, 0x18, 0x30, 0x60, 0x40, 0x00}, // U+005C (\)
+    {0x1E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1E, 0x00}, // U+005D (])
+    {0x08, 0x1C, 0x36, 0x63, 0x00, 0x00, 0x00, 0x00}, // U+005E (^)
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF}, // U+005F (_)
+    {0x0C, 0x0C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0060 (`)
+    {0x00, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x6E, 0x00}, // U+0061 (a)
+    {0x07, 0x06, 0x06, 0x3E, 0x66, 0x66, 0x3B, 0x00}, // U+0062 (b)
+    {0x00, 0x00, 0x1E, 0x33, 0x03, 0x33, 0x1E, 0x00}, // U+0063 (c)
+    {0x38, 0x30, 0x30, 0x3e, 0x33, 0x33, 0x6E, 0x00}, // U+0064 (d)
+    {0x00, 0x00, 0x1E, 0x33, 0x3f, 0x03, 0x1E, 0x00}, // U+0065 (e)
+    {0x1C, 0x36, 0x06, 0x0f, 0x06, 0x06, 0x0F, 0x00}, // U+0066 (f)
+    {0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x1F}, // U+0067 (g)
+    {0x07, 0x06, 0x36, 0x6E, 0x66, 0x66, 0x67, 0x00}, // U+0068 (h)
+    {0x0C, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+0069 (i)
+    {0x30, 0x00, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E}, // U+006A (j)
+    {0x07, 0x06, 0x66, 0x36, 0x1E, 0x36, 0x67, 0x00}, // U+006B (k)
+    {0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+006C (l)
+    {0x00, 0x00, 0x33, 0x7F, 0x7F, 0x6B, 0x63, 0x00}, // U+006D (m)
+    {0x00, 0x00, 0x1F, 0x33, 0x33, 0x33, 0x33, 0x00}, // U+006E (n)
+    {0x00, 0x00, 0x1E, 0x33, 0x33, 0x33, 0x1E, 0x00}, // U+006F (o)
+    {0x00, 0x00, 0x3B, 0x66, 0x66, 0x3E, 0x06, 0x0F}, // U+0070 (p)
+    {0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x78}, // U+0071 (q)
+    {0x00, 0x00, 0x3B, 0x6E, 0x66, 0x06, 0x0F, 0x00}, // U+0072 (r)
+    {0x00, 0x00, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x00}, // U+0073 (s)
+    {0x08, 0x0C, 0x3E, 0x0C, 0x0C, 0x2C, 0x18, 0x00}, // U+0074 (t)
+    {0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x6E, 0x00}, // U+0075 (u)
+    {0x00, 0x00, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00}, // U+0076 (v)
+    {0x00, 0x00, 0x63, 0x6B, 0x7F, 0x7F, 0x36, 0x00}, // U+0077 (w)
+    {0x00, 0x00, 0x63, 0x36, 0x1C, 0x36, 0x63, 0x00}, // U+0078 (x)
+    {0x00, 0x00, 0x33, 0x33, 0x33, 0x3E, 0x30, 0x1F}, // U+0079 (y)
+    {0x00, 0x00, 0x3F, 0x19, 0x0C, 0x26, 0x3F, 0x00}, // U+007A (z)
+    {0x38, 0x0C, 0x0C, 0x07, 0x0C, 0x0C, 0x38, 0x00}, // U+007B ({)
+    {0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00}, // U+007C (|)
+    {0x07, 0x0C, 0x0C, 0x38, 0x0C, 0x0C, 0x07, 0x00}, // U+007D (})
+    {0x6E, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+007E (~)
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}  // U+007F
 };
 #endif
diff --git a/userland/windowserver/ws.c b/userland/windowserver/ws.c
index 3adefe0..e9dc802 100644
--- a/userland/windowserver/ws.c
+++ b/userland/windowserver/ws.c
@@ -164,8 +164,9 @@ void setup(void) {
 
   num_fds = 100;
   fds = calloc(num_fds, sizeof(struct pollfd));
-  for (size_t i = 0; i < num_fds; i++)
+  for (size_t i = 0; i < num_fds; i++) {
     fds[i].fd = -1;
+  }
   // Create socket
   int socket_fd = create_socket();
   assert(socket_fd >= 0);
@@ -188,15 +189,18 @@ void setup(void) {
 }
 
 void reset_revents(struct pollfd *fds, size_t s) {
-  for (size_t i = 0; i < s - 1; i++)
+  for (size_t i = 0; i < s - 1; i++) {
     fds[i].revents = 0;
+  }
 }
 
 void add_fd(int fd) {
   int i;
-  for (i = 0; i < num_fds; i++)
-    if (-1 == fds[i].fd)
+  for (i = 0; i < num_fds; i++) {
+    if (-1 == fds[i].fd) {
       break;
+    }
+  }
 
   fds[i].fd = fd;
   fds[i].events = POLLIN | POLLHUP;
@@ -314,10 +318,12 @@ void send_kill_window(WINDOW *w) {
 }
 
 int windowserver_key_events(struct KEY_EVENT ev, int *redraw) {
-  if (ev.release)
+  if (ev.release) {
     return 0;
-  if (!(ev.mode & (1 << 1)))
+  }
+  if (!(ev.mode & (1 << 1))) {
     return 0;
+  }
   if ('q' == ev.c) {
     send_kill_window(main_display.active_window);
     return 1;
@@ -333,8 +339,9 @@ int windowserver_key_events(struct KEY_EVENT ev, int *redraw) {
     }
     return 1;
   }
-  if (!main_display.active_window)
+  if (!main_display.active_window) {
     return 0;
+  }
   int x = 0;
   int y = 0;
   switch (ev.c) {
@@ -384,8 +391,9 @@ void parse_mouse_event(int fd) {
   int left_button = 0;
   struct mouse_event e;
   int rc = read(fd, &e, sizeof(e));
-  if (rc <= 0)
+  if (rc <= 0) {
     return;
+  }
 
   uint8_t xs = e.buttons & (1 << 4);
   uint8_t ys = e.buttons & (1 << 5);
@@ -446,8 +454,9 @@ void parse_keyboard_event(int fd) {
   int redraw = 0;
   for (;;) {
     int rc;
-    if (0 > (rc = read(fd, &ev[0], sizeof(ev))))
+    if (0 > (rc = read(fd, &ev[0], sizeof(ev)))) {
       break;
+    }
     int n = rc / sizeof(ev[0]);
     for (int i = 0; i < n; i++) {
       if (windowserver_key_events(ev[i], &redraw)) {
@@ -509,10 +518,12 @@ void kill_window(WINDOW *w) {
 
 void parse_revents(struct pollfd *fds, size_t s) {
   for (size_t i = 0; i < s - 1; i++) {
-    if (!fds[i].revents)
+    if (!fds[i].revents) {
       continue;
-    if (-1 == fds[i].fd)
+    }
+    if (-1 == fds[i].fd) {
       continue;
+    }
     if (socket_fd_poll == i && fds[i].revents & POLLIN) {
       add_window(fds[i].fd);
       continue;
@@ -587,12 +598,14 @@ int draw_window(DISPLAY *disp, WINDOW *w, int id) {
   y += border_px;
 
   for (int i = 0; i < sy; i++) {
-    if ((i + y) * disp->width + x > disp->height * disp->width)
+    if ((i + y) * disp->width + x > disp->height * disp->width) {
       break;
+    }
     uint32_t *ptr =
         disp->back_buffer + disp->bpp * ((i + y) * disp->width) + x * disp->bpp;
-    if (i * sx > disp->height * disp->width)
+    if (i * sx > disp->height * disp->width) {
       break;
+    }
     if (i < b_sy) {
       uint32_t *bm = &w->bitmap_ptr[i * b_sx];
       int j = 0;