%build
%cargo_build
mv target/release/espanso ./espanso
%cargo_build -f wayland
mv target/release/espanso ./espanso-wayland

diff -up espanso-2.1.8/espanso/src/cli/daemon/watcher.rs.orig espanso-2.1.8/espanso/src/cli/daemon/watcher.rs
--- espanso-2.1.8/espanso/src/cli/daemon/watcher.rs.orig    2022-11-01 11:23:19.000000000 +0100
+++ espanso-2.1.8/espanso/src/cli/daemon/watcher.rs 2023-09-21 20:03:25.199873322 +0200
@@ -19,7 +19,11 @@

 use std::{path::Path, time::Duration};

-use notify::{DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher};
+use notify_debouncer_mini::{
+  new_debouncer_opt,
+  notify::{Config, RecommendedWatcher, RecursiveMode},
+  Debouncer,
+};

 use anyhow::Result;
 use crossbeam::{channel::Sender, select};
@@ -51,11 +55,16 @@ pub fn initialize_and_spawn(config_dir:
 fn watcher_main(config_dir: &Path, debounce_tx: crossbeam::channel::Sender<()>) {
   let (tx, rx) = std::sync::mpsc::channel();

-  let mut watcher: RecommendedWatcher =
-    Watcher::new(tx, Duration::from_millis(WATCHER_NOTIFY_DELAY_MS))
-      .expect("unable to create file watcher");
+  let mut watcher: Debouncer<RecommendedWatcher> = new_debouncer_opt(
+    Duration::from_millis(WATCHER_DEBOUNCE_DURATION_MS),
+    None,
+    tx,
+    Config::default().with_poll_interval(Duration::from_millis(WATCHER_NOTIFY_DELAY_MS)),
+  )
+  .expect("unable to create file watcher");

   watcher
+    .watcher()
     .watch(&config_dir, RecursiveMode::Recursive)
     .expect("unable to start file watcher");

@@ -63,32 +72,19 @@ fn watcher_main(config_dir: &Path, debou

   loop {
     let should_reload = match rx.recv() {
-      Ok(event) => {
-        let path = match event {
-          DebouncedEvent::Create(path) => Some(path),
-          DebouncedEvent::Write(path) => Some(path),
-          DebouncedEvent::Remove(path) => Some(path),
-          DebouncedEvent::Rename(_, path) => Some(path),
-          _ => None,
-        };
-
-        if let Some(path) = path {
-          let extension = path
-            .extension()
-            .unwrap_or_default()
-            .to_string_lossy()
-            .to_ascii_lowercase();
-
-          if ["yml", "yaml"].iter().any(|ext| ext == &extension) {
-            // Only load non-hidden yml files
-            !is_file_hidden(&path)
-          } else {
-            // If there is no extension, it's probably a folder
-            extension.is_empty()
-          }
-        } else {
-          false
-        }
+      Ok(Ok(events)) => events.iter().any(|one_event| {
+        let path = &one_event.path; // Changed this line
+        let extension = path
+          .extension()
+          .unwrap_or_default()
+          .to_string_lossy()
+          .to_ascii_lowercase();
+
+        ["yml", "yaml"].iter().any(|ext| ext == &extension) && !is_file_hidden(path)
+      }),
+      Ok(Err(e)) => {
+        warn!("error while watching files: {:?}", e);
+        false
       }
       Err(e) => {
         warn!("error while watching files: {:?}", e);
diff -up espanso-2.1.8/espanso/src/cli/service/linux.rs.orig espanso-2.1.8/espanso/src/cli/service/linux.rs
--- espanso-2.1.8/espanso/src/cli/service/linux.rs.orig 2022-11-01 11:23:19.000000000 +0100
+++ espanso-2.1.8/espanso/src/cli/service/linux.rs  2023-09-21 20:03:25.199873322 +0200
@@ -27,7 +27,12 @@ use thiserror::Error;

 use crate::{error_eprintln, info_println, warn_eprintln};

+#[cfg(feature = "wayland")]
+const LINUX_SERVICE_NAME: &str = "espanso-wayland";
+
+#[cfg(not(feature = "wayland"))]
 const LINUX_SERVICE_NAME: &str = "espanso";
+
 const LINUX_SERVICE_CONTENT: &str = include_str!("../../res/linux/systemd.service");
 #[allow(clippy::transmute_bytes_to_str)]
 const LINUX_SERVICE_FILENAME: &str = formatcp!("{}.service", LINUX_SERVICE_NAME);
diff -up espanso-2.1.8/espanso/src/main.rs.orig espanso-2.1.8/espanso/src/main.rs
--- espanso-2.1.8/espanso/src/main.rs.orig  2022-11-01 11:23:19.000000000 +0100
+++ espanso-2.1.8/espanso/src/main.rs   2023-09-21 20:03:25.200873315 +0200
@@ -30,8 +30,11 @@ use cli::{CliAlias, CliModule, CliModule
 use log::{error, info, warn};
 use logging::FileProxy;
 use simplelog::{
-  CombinedLogger, ConfigBuilder, LevelFilter, SharedLogger, TermLogger, TerminalMode, WriteLogger,
+  ColorChoice, CombinedLogger, ConfigBuilder, LevelFilter, SharedLogger, TermLogger, TerminalMode,
+  WriteLogger,
 };
+use std::convert::identity;
+use time::macros::format_description;

 use crate::{
   cli::{LogMode, PathsOverrides},
@@ -524,12 +527,9 @@ For example, specifying 'email' is equiv
     let log_proxy = FileProxy::new();
     if handler.enable_logs {
       let config = ConfigBuilder::new()
-        .set_time_to_local(true)
-        .set_time_format(format!(
-          "%H:%M:%S [{}({})]",
-          handler.subcommand,
-          std::process::id()
-        ))
+        .set_time_offset_to_local()
+        .unwrap_or_else(identity)
+        .set_time_format_custom(format_description!("[hour]:[minute]:[second]]"))
         .set_location_level(LevelFilter::Off)
         .add_filter_ignore_str("html5ever")
         .build();
@@ -541,7 +541,10 @@ For example, specifying 'email' is equiv
       )];

       if !handler.disable_logs_terminal_output {
-        outputs.insert(0, TermLogger::new(log_level, config, TerminalMode::Mixed));
+        outputs.insert(
+          0,
+          TermLogger::new(log_level, config, TerminalMode::Mixed, ColorChoice::Auto),
+        );
       }

       CombinedLogger::init(outputs).expect("unable to initialize logs");