diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
deleted file mode 100644
index a8e0474..000000000
--- a/.github/workflows/check.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Check
-
-on: push
-
-env:
-    CARGO_TERM_COLOR: always
-
-jobs:
-    check:
-        runs-on: ubuntu-latest
-        name: Check
-        steps:
-            - uses: actions/checkout@v2
-            - name: cargo check
-              run: cargo check
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..00123ca
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,36 @@
+name: Check
+
+on: push
+
+env:
+    CARGO_TERM_COLOR: always
+
+jobs:
+    check:
+        runs-on: ubuntu-latest
+        name: Check
+        steps:
+            - uses: actions/checkout@v3
+            - name: cargo check
+              run: cargo check
+    test:
+        runs-on: ubuntu-latest
+        name: Test
+        steps:
+            - uses: actions/checkout@v3
+            - name: cargo test
+              run: cargo test
+    clippy:
+        runs-on: ubuntu-latest
+        name: Lint (clippy)
+        steps:
+            - uses: actions/checkout@v3
+            - name: cargo clippy
+              run: cargo clippy -- -D warnings
+    fmt:
+        runs-on: ubuntu-latest
+        name: Format
+        steps:
+            - uses: actions/checkout@v3
+            - name: cargo fmt
+              run: cargo fmt --check
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
deleted file mode 100644
index 34a90a5..000000000
--- a/.github/workflows/clippy.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Clippy
-
-on: push
-
-env:
-    CARGO_TERM_COLOR: always
-
-jobs:
-    clippy:
-        runs-on: ubuntu-latest
-        name: Lint (clippy)
-        steps:
-            - uses: actions/checkout@v2
-            - name: cargo clippy
-              run: cargo clippy -- -D warnings
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index 0a932ff..000000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Tests
-
-on: push
-
-env:
-    CARGO_TERM_COLOR: always
-
-jobs:
-    test:
-        runs-on: ubuntu-latest
-        name: Test
-        steps:
-            - uses: actions/checkout@v2
-            - name: cargo test
-              run: cargo test
diff --git a/Cargo.toml b/Cargo.toml
index bb5c341..09b1325 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aoc"
-version = "0.3.0"
+version = "16.0.0"
 edition = "2021"
 authors = ["Matej Janežič <janezic.mj@gmail.com>"]
 default-run = "aoc"
diff --git a/README.md b/README.md
index dd61ac8..b8f68e4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
-![Check](https://github.com/janezicmatej/aoc-template/actions/workflows/check.yml/badge.svg)
-![Tests](https://github.com/janezicmatej/aoc-template/actions/workflows/tests.yml/badge.svg)
-![Clippy](https://github.com/janezicmatej/aoc-template/actions/workflows/clippy.yml/badge.svg)
+![ci](https://github.com/janezicmatej/aoc-template/actions/workflows/ci.yml/badge.svg)
 # Advent-of-Code {YEAR}
 *This is a dumbed down version of [fspoettel/advent-of-code-rust](https://github.com/fspoettel/advent-of-code-rust) with some extra features*