6 files changed, 23 insertions, 27 deletions
diff --git a/zellij-client/src/fake_client.rs b/zellij-client/src/fake_client.rs
index 2199e12fb..7338d633a 100644
--- a/zellij-client/src/fake_client.rs
+++ b/zellij-client/src/fake_client.rs
@@ -3,8 +3,6 @@
 //! Multiple actions at the same time can be dispatched.
 use log::debug;
 use std::{fs, path::PathBuf, thread};
-use zellij_tile::prelude::{ClientId, Style};
-use zellij_utils::errors::ContextType;
 
 use crate::{
     command_is_executing::CommandIsExecuting, input_handler::input_actions,
@@ -14,6 +12,8 @@ use crate::{
 use zellij_utils::{
     channels::{self, ChannelWithContext, SenderWithContext},
     cli::CliArgs,
+    data::{ClientId, Style},
+    errors::ContextType,
     input::{actions::Action, config::Config, layout::LayoutFromYaml, options::Options},
     ipc::{ClientAttributes, ClientToServerMsg, ServerToClientMsg},
 };
diff --git a/zellij-client/src/input_handler.rs b/zellij-client/src/input_handler.rs
index 18ccf35b3..3f92c5376 100644
--- a/zellij-client/src/input_handler.rs
+++ b/zellij-client/src/input_handler.rs
@@ -1,13 +1,4 @@
 //! Main input logic.
-use zellij_utils::{
-    input::{
-        mouse::{MouseButton, MouseEvent},
-        options::Options,
-    },
-    termwiz::input::InputEvent,
-    zellij_tile,
-};
-
 use crate::{
     os_input_output::ClientOsApi,
     stdin_ansi_parser::{AnsiStdinInstructionOrKeys, StdinAnsiParser},
@@ -15,13 +6,20 @@ use crate::{
 };
 use zellij_utils::{
     channels::{Receiver, SenderWithContext, OPENCALLS},
+    data::{InputMode, Key},
     errors::{ContextType, ErrorContext},
-    input::{actions::Action, cast_termwiz_key, config::Config, keybinds::Keybinds},
+    input::{
+        actions::Action,
+        cast_termwiz_key,
+        config::Config,
+        keybinds::Keybinds,
+        mouse::{MouseButton, MouseEvent},
+        options::Options,
+    },
     ipc::{ClientToServerMsg, ExitReason},
+    termwiz::input::InputEvent,
 };
 
-use zellij_tile::data::{InputMode, Key};
-
 /// Handles the dispatching of [`Action`]s according to the current
 /// [`InputMode`], and keep tracks of the current [`InputMode`].
 struct InputHandler {
diff --git a/zellij-client/src/lib.rs b/zellij-client/src/lib.rs
index aeb74abba..9790984ee 100644
--- a/zellij-client/src/lib.rs
+++ b/zellij-client/src/lib.rs
@@ -14,16 +14,15 @@ use std::io::{self, Write};
 use std::path::Path;
 use std::process::Command;
 use std::thread;
-use zellij_tile::prelude::{ClientId, Style};
 
 use crate::{
     command_is_executing::CommandIsExecuting, input_handler::input_loop,
     os_input_output::ClientOsApi, stdin_handler::stdin_loop,
 };
-use zellij_tile::data::InputMode;
 use zellij_utils::{
     channels::{self, ChannelWithContext, SenderWithContext},
     consts::ZELLIJ_IPC_PIPE,
+    data::{ClientId, InputMode, Style},
     envs,
     errors::{ClientContext, ContextType, ErrorInstruction},
     input::{actions::Action, config::Config, options::Options},
diff --git a/zellij-client/src/os_input_output.rs b/zellij-client/src/os_input_output.rs
index a344f940d..60c22cc98 100644
--- a/zellij-client/src/os_input_output.rs
+++ b/zellij-client/src/os_input_output.rs
@@ -1,5 +1,5 @@
 use zellij_utils::pane_size::Size;
-use zellij_utils::{interprocess, libc, nix, signal_hook, zellij_tile};
+use zellij_utils::{interprocess, libc, nix, signal_hook};
 
 use interprocess::local_socket::LocalSocketStream;
 use mio::{unix::SourceFd, Events, Interest, Poll, Token};
@@ -11,8 +11,8 @@ use std::os::unix::io::RawFd;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 use std::{io, thread, time};
-use zellij_tile::data::Palette;
 use zellij_utils::{
+    data::Palette,
     errors::ErrorContext,
     ipc::{ClientToServerMsg, IpcReceiverWithContext, IpcSenderWithContext, ServerToClientMsg},
     shared::default_palette,
diff --git a/zellij-client/src/stdin_ansi_parser.rs b/zellij-client/src/stdin_ansi_parser.rs
index a3ab117ce..25f0e4fbb 100644
--- a/zellij-client/src/stdin_ansi_parser.rs
+++ b/zellij-client/src/stdin_ansi_parser.rs
@@ -1,8 +1,10 @@
-use zellij_utils::pane_size::SizeInPixels;
-
-use zellij_utils::{ipc::PixelDimensions, lazy_static::lazy_static, regex::Regex};
-
-use zellij_tile::data::{CharOrArrow, Key};
+use zellij_utils::{
+    data::{CharOrArrow, Key},
+    ipc::PixelDimensions,
+    lazy_static::lazy_static,
+    pane_size::SizeInPixels,
+    regex::Regex,
+};
 
 pub struct StdinAnsiParser {
     expected_ansi_instructions: usize,
diff --git a/zellij-client/src/unit/input_handler_tests.rs b/zellij-client/src/unit/input_handler_tests.rs
index 8fe4a5af9..b772eb5c4 100644
--- a/zellij-client/src/unit/input_handler_tests.rs
+++ b/zellij-client/src/unit/input_handler_tests.rs
@@ -1,11 +1,11 @@
 use super::input_loop;
+use zellij_utils::data::{InputMode, Palette};
 use zellij_utils::input::actions::{Action, Direction};
 use zellij_utils::input::config::Config;
 use zellij_utils::input::options::Options;
 use zellij_utils::nix;
 use zellij_utils::pane_size::{Size, SizeInPixels};
 use zellij_utils::termwiz::input::{InputEvent, KeyCode, KeyEvent, Modifiers};
-use zellij_utils::zellij_tile::data::Palette;
 
 use crate::InputInstruction;
 use crate::{
@@ -15,12 +15,9 @@ use crate::{
 
 use std::path::Path;
 
-use zellij_utils::zellij_tile;
-
 use std::io;
 use std::os::unix::io::RawFd;
 use std::sync::{Arc, Mutex};
-use zellij_tile::data::InputMode;
 use zellij_utils::{
     errors::ErrorContext,
     ipc::{ClientToServerMsg, PixelDimensions, ServerToClientMsg},