diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
index b4d3af2f..b11d5016 100644
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -76,7 +76,7 @@ jobs:
           - { target: i686-pc-windows-msvc        , os: windows-2025                  }
           - { target: i686-unknown-linux-gnu      , os: ubuntu-24.04, use-cross: true }
           - { target: i686-unknown-linux-musl     , os: ubuntu-24.04, use-cross: true }
-          - { target: x86_64-apple-darwin         , os: macos-13                      }
+          - { target: x86_64-apple-darwin         , os: macos-15-intel                }
           - { target: aarch64-apple-darwin        , os: macos-15                      }
           # Was causing CI failures unrelated to app logic
           # - { target: x86_64-pc-windows-gnu       , os: windows-2019                  }
diff --git a/Cargo.toml b/Cargo.toml
index 8a247b7d..fc4e82d9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 authors = ["David Peter <mail@david-peter.de>"]
 categories = ["command-line-utilities"]
+keywords = ["hex", "viewer"]
 description = "A command-line hex viewer"
 homepage = "https://github.com/sharkdp/hexyl"
 license = "MIT/Apache-2.0"
diff --git a/src/lib.rs b/src/lib.rs
index be196698..48fbc5bd 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -601,7 +601,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
                     if self.show_color {
                         self.writer.write_all(COLOR_RESET.as_bytes())?;
                     }
-                } else if i % (self.group_size as usize) == 0 {
+                } else if i.is_multiple_of(self.group_size as usize) {
                     self.writer.write_all(b" ")?;
                 }
                 for _ in 0..self.base_digits {
@@ -610,7 +610,7 @@ impl<'a, Writer: Write> Printer<'a, Writer> {
             }
             Squeezer::Delete => self.writer.write_all(b"   ")?,
             Squeezer::Ignore | Squeezer::Disabled => {
-                if i % (self.group_size as usize) == 0 {
+                if i.is_multiple_of(self.group_size as usize) {
                     self.writer.write_all(b" ")?;
                 }
                 if self.show_color && self.curr_color != Some(Byte(b).color(self.color_scheme)) {