diff --git a/src/entrybox.cc b/src/entrybox.cc
index 8c558d0..8ebdd63 100644
--- a/src/entrybox.cc
+++ b/src/entrybox.cc
@@ -80,6 +80,7 @@ EntryBox::Label::Label(std::function<void(int state, const std::string &message)
 }
 
 EntryBox::EntryBox() : Gtk::Box(Gtk::ORIENTATION_VERTICAL), upper_box(Gtk::ORIENTATION_HORIZONTAL), lower_box(Gtk::ORIENTATION_HORIZONTAL) {
+  get_style_context()->add_class("juci_entry");
   pack_start(upper_box, Gtk::PACK_SHRINK);
   pack_start(lower_box, Gtk::PACK_SHRINK);
   this->set_focus_chain({&lower_box});
diff --git a/src/notebook.cc b/src/notebook.cc
index 71a1a5d..363ba55 100644
--- a/src/notebook.cc
+++ b/src/notebook.cc
@@ -229,7 +229,7 @@ void Notebook::open(const boost::filesystem::path &file_path_, Position position
       auto num_errors = std::get<1>(view->status_diagnostics);
       auto num_fix_its = std::get<2>(view->status_diagnostics);
       if(num_warnings > 0 || num_errors > 0 || num_fix_its > 0) {
-        auto normal_color = get_style_context()->get_color(Gtk::StateFlags::STATE_FLAG_NORMAL);
+        auto normal_color = status_diagnostics.get_style_context()->get_color(Gtk::StateFlags::STATE_FLAG_NORMAL);
         Gdk::RGBA yellow;
         yellow.set_rgba(1.0, 1.0, 0.2);
         double factor = 0.5;
diff --git a/src/window.cc b/src/window.cc
index 7716453..2ec979b 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -19,6 +19,7 @@ Window::Window() {
   Gsv::init();
 
   set_title("juCi++");
+  get_style_context()->add_class("juci_window");
   set_events(Gdk::POINTER_MOTION_MASK | Gdk::FOCUS_CHANGE_MASK | Gdk::SCROLL_MASK | Gdk::LEAVE_NOTIFY_MASK);
 
   auto provider = Gtk::CssProvider::create();
@@ -1604,6 +1605,7 @@ void Window::add_widgets() {
   notebook_vbox->pack_end(EntryBox::get(), Gtk::PACK_SHRINK);
 
   auto terminal_scrolled_window = Gtk::manage(new Gtk::ScrolledWindow());
+  terminal_scrolled_window->get_style_context()->add_class("juci_terminal_scrolledwindow");
   terminal_scrolled_window->add(Terminal::get());
 
   int width, height;
@@ -1620,6 +1622,7 @@ void Window::add_widgets() {
   hpaned->pack2(*notebook_and_terminal_vpaned, Gtk::SHRINK);
 
   auto status_hbox = Gtk::manage(new Gtk::Box());
+  status_hbox->get_style_context()->add_class("juci_status_box");
   status_hbox->set_homogeneous(true);
   status_hbox->pack_start(*Gtk::manage(new Gtk::Box()));
   auto status_right_hbox = Gtk::manage(new Gtk::Box());
@@ -1630,6 +1633,7 @@ void Window::add_widgets() {
   status_hbox->pack_end(*status_right_overlay);
 
   auto status_overlay = Gtk::manage(new Gtk::Overlay());
+  status_overlay->get_style_context()->add_class("juci_status_overlay");
   status_overlay->add(*status_hbox);
   auto status_file_info_hbox = Gtk::manage(new Gtk::Box);
   status_file_info_hbox->pack_start(Notebook::get().status_file_path, Gtk::PACK_SHRINK);
@@ -1658,6 +1662,7 @@ void Window::add_widgets() {
   add(*overlay);
 
   show_all_children();
+  EntryBox::get().hide();
   Info::get().hide();
 
   //Scroll to end of terminal whenever info is printed