diff --git a/Cargo.toml b/Cargo.toml
index f8cb89610..395b5b317 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,23 +1,23 @@
 [package]
-name = "imgui"
-version = "0.0.19-pre"
-authors = ["Joonas Javanainen <joonas.javanainen@gmail.com>", "imgui-rs contributors"]
+name = "aflak_imgui"
+version = "0.18.1"
+authors = ["Joonas Javanainen <joonas.javanainen@gmail.com>",
+           "Malik Olivier Boussejra <malik@boussejra.com>",
+           "imgui-rs contributors"]
 description = "High-level Rust bindings to dear imgui"
-homepage = "https://github.com/Gekkio/imgui-rs"
-repository = "https://github.com/Gekkio/imgui-rs"
+homepage = "https://github.com/malikolivier/imgui-rs"
+repository = "https://github.com/malikolivier/imgui-rs"
 license = "MIT/Apache-2.0"
 categories = ["gui", "api-bindings"]
 readme = "README.markdown"
 
-[badges]
-travis-ci = { repository = "Gekkio/imgui-rs" }
-
 [dependencies]
-imgui-sys = { version = "0.0.19-pre", path = "imgui-sys" }
+aflak_imgui-sys = { version = "0.18.1", path = "imgui-sys" }
 
+# Comment this section when publishing new releases to crates.io!
 [dev-dependencies]
-glium = { version = "0.20", default-features = true }
-imgui-glium-renderer = { path = "imgui-glium-renderer" }
+# glium = { version = "0.20", default-features = true }
+# aflak_imgui-glium-renderer = { path = "imgui-glium-renderer", version = "0.18.1" }
 
 [workspace]
 members = ["imgui-examples", "imgui-sys", "imgui-gfx-renderer", "imgui-glium-renderer"]
diff --git a/imgui-examples/Cargo.toml b/imgui-examples/Cargo.toml
index 981ca2046..b68561412 100644
--- a/imgui-examples/Cargo.toml
+++ b/imgui-examples/Cargo.toml
@@ -13,7 +13,7 @@ gfx = "0.17"
 gfx_window_glutin = "0.22"
 glium = { version = "0.20", default-features = true }
 glutin = "0.14"
-imgui = { version = "0.0.19-pre", path = "../" }
+aflak_imgui = { version = "0.18.1", path = "../" }
 imgui-gfx-renderer = { version = "0.0.19-pre", path = "../imgui-gfx-renderer" }
-imgui-glium-renderer = { version = "0.0.19-pre", path = "../imgui-glium-renderer" }
-imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["gfx", "glium"] }
+aflak_imgui-glium-renderer = { version = "0.18.1", path = "../imgui-glium-renderer" }
+aflak_imgui-sys = { version = "0.18.1", path = "../imgui-sys", features = ["gfx", "glium"] }
diff --git a/imgui-examples/examples/color_button.rs b/imgui-examples/examples/color_button.rs
index 5febfe3e0..089cfd2e6 100644
--- a/imgui-examples/examples/color_button.rs
+++ b/imgui-examples/examples/color_button.rs
@@ -1,7 +1,7 @@
 extern crate glium;
 #[macro_use]
-extern crate imgui;
-extern crate imgui_glium_renderer;
+extern crate aflak_imgui as imgui;
+extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
 
 use imgui::*;
 
diff --git a/imgui-examples/examples/custom_textures.rs b/imgui-examples/examples/custom_textures.rs
index de3bb7c1e..b67199d85 100644
--- a/imgui-examples/examples/custom_textures.rs
+++ b/imgui-examples/examples/custom_textures.rs
@@ -1,7 +1,7 @@
 extern crate glium;
 #[macro_use]
-extern crate imgui;
-extern crate imgui_glium_renderer;
+extern crate aflak_imgui as imgui;
+extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
 
 mod support_custom_textures;
 
diff --git a/imgui-examples/examples/hello_gfx.rs b/imgui-examples/examples/hello_gfx.rs
index f406fc37a..e3d09639a 100644
--- a/imgui-examples/examples/hello_gfx.rs
+++ b/imgui-examples/examples/hello_gfx.rs
@@ -2,9 +2,9 @@ extern crate gfx;
 extern crate gfx_window_glutin;
 extern crate glutin;
 #[macro_use]
-extern crate imgui;
+extern crate aflak_imgui as imgui;
 extern crate imgui_gfx_renderer;
-extern crate imgui_sys;
+extern crate aflak_imgui_sys as imgui_sys;
 
 use imgui::*;
 
diff --git a/imgui-examples/examples/hello_world.rs b/imgui-examples/examples/hello_world.rs
index b5dddefdc..df8e2e583 100644
--- a/imgui-examples/examples/hello_world.rs
+++ b/imgui-examples/examples/hello_world.rs
@@ -1,7 +1,7 @@
 extern crate glium;
 #[macro_use]
-extern crate imgui;
-extern crate imgui_glium_renderer;
+extern crate aflak_imgui as imgui;
+extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
 
 use imgui::*;
 
diff --git a/imgui-examples/examples/test_drawing_channels_split.rs b/imgui-examples/examples/test_drawing_channels_split.rs
index d38d8b85b..043cc769d 100644
--- a/imgui-examples/examples/test_drawing_channels_split.rs
+++ b/imgui-examples/examples/test_drawing_channels_split.rs
@@ -1,6 +1,6 @@
 extern crate glium;
-extern crate imgui;
-extern crate imgui_glium_renderer;
+extern crate aflak_imgui as imgui;
+extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
 
 mod support;
 
diff --git a/imgui-examples/examples/test_window.rs b/imgui-examples/examples/test_window.rs
index d1114164e..30b64e747 100644
--- a/imgui-examples/examples/test_window.rs
+++ b/imgui-examples/examples/test_window.rs
@@ -1,6 +1,6 @@
 extern crate glium;
-extern crate imgui;
-extern crate imgui_glium_renderer;
+extern crate aflak_imgui as imgui;
+extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
 
 mod support;
 
diff --git a/imgui-examples/examples/test_window_impl.rs b/imgui-examples/examples/test_window_impl.rs
index a8a6ec180..447f4cd00 100644
--- a/imgui-examples/examples/test_window_impl.rs
+++ b/imgui-examples/examples/test_window_impl.rs
@@ -1,7 +1,7 @@
 extern crate glium;
 #[macro_use]
-extern crate imgui;
-extern crate imgui_glium_renderer;
+extern crate aflak_imgui as imgui;
+extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
 
 use imgui::*;
 
diff --git a/imgui-gfx-renderer/Cargo.toml b/imgui-gfx-renderer/Cargo.toml
index 214a112b3..509b80ca3 100644
--- a/imgui-gfx-renderer/Cargo.toml
+++ b/imgui-gfx-renderer/Cargo.toml
@@ -13,5 +13,5 @@ travis-ci = { repository = "Gekkio/imgui-rs" }
 
 [dependencies]
 gfx = "0.17"
-imgui = { version = "0.0.19-pre", path = "../" }
-imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["gfx"] }
+aflak_imgui = { version = "0.18.1", path = "../" }
+aflak_imgui-sys = { version = "0.18.1", path = "../imgui-sys", features = ["gfx"] }
diff --git a/imgui-gfx-renderer/src/lib.rs b/imgui-gfx-renderer/src/lib.rs
index 639d06b10..6541b80a8 100644
--- a/imgui-gfx-renderer/src/lib.rs
+++ b/imgui-gfx-renderer/src/lib.rs
@@ -1,6 +1,6 @@
 #[macro_use]
 extern crate gfx;
-extern crate imgui;
+extern crate aflak_imgui as imgui;
 
 mod im_texture;
 pub use im_texture::Texture;
diff --git a/imgui-glium-renderer/Cargo.toml b/imgui-glium-renderer/Cargo.toml
index ba1c395bb..7f240e23f 100644
--- a/imgui-glium-renderer/Cargo.toml
+++ b/imgui-glium-renderer/Cargo.toml
@@ -1,17 +1,14 @@
 [package]
-name = "imgui-glium-renderer"
-version = "0.0.19-pre"
+name = "aflak_imgui-glium-renderer"
+version = "0.18.1"
 authors = ["Joonas Javanainen <joonas.javanainen@gmail.com>", "imgui-rs contributors"]
 description = "Glium renderer for the imgui crate"
-homepage = "https://github.com/Gekkio/imgui-rs"
-repository = "https://github.com/Gekkio/imgui-rs"
+homepage = "https://github.com/malikolivier/imgui-rs"
+repository = "https://github.com/malikolivier/imgui-rs"
 license = "MIT/Apache-2.0"
 categories = ["gui", "rendering"]
 
-[badges]
-travis-ci = { repository = "Gekkio/imgui-rs" }
-
 [dependencies]
-glium = { version = "0.20", default-features = false }
-imgui = { version = "0.0.19-pre", path = "../" }
-imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["glium"] }
+glium = { version = "0.20", features = ["glutin"] }
+aflak_imgui = { version = "0.18.1", path = "../" }
+aflak_imgui-sys = { version = "0.18.1", path = "../imgui-sys", features = ["glium"] }
diff --git a/imgui-glium-renderer/src/lib.rs b/imgui-glium-renderer/src/lib.rs
index c316a93a0..1e35164a9 100644
--- a/imgui-glium-renderer/src/lib.rs
+++ b/imgui-glium-renderer/src/lib.rs
@@ -1,6 +1,6 @@
 #[macro_use]
 extern crate glium;
-extern crate imgui;
+extern crate aflak_imgui as imgui;
 
 mod context;
 mod im_texture;
diff --git a/imgui-sys/Cargo.toml b/imgui-sys/Cargo.toml
index 88873f831..9d6acecfa 100644
--- a/imgui-sys/Cargo.toml
+++ b/imgui-sys/Cargo.toml
@@ -1,17 +1,14 @@
 [package]
-name = "imgui-sys"
-version = "0.0.19-pre"
+name = "aflak_imgui-sys"
+version = "0.18.1"
 authors = ["Joonas Javanainen <joonas.javanainen@gmail.com>", "imgui-rs contributors"]
 description = "Raw FFI bindings to dear imgui"
-homepage = "https://github.com/Gekkio/imgui-rs"
-repository = "https://github.com/Gekkio/imgui-rs"
+homepage = "https://github.com/malikolivier/imgui-rs"
+repository = "https://github.com/malikolivier/imgui-rs"
 license = "MIT/Apache-2.0"
 categories = ["gui", "external-ffi-bindings"]
 build = "build.rs"
 
-[badges]
-travis-ci = { repository = "Gekkio/imgui-rs" }
-
 [dependencies]
 libc = "0.2"
 bitflags = "1.0"
diff --git a/src/lib.rs b/src/lib.rs
index 4ebd1a90a..ab4699f72 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,4 @@
-pub extern crate imgui_sys as sys;
+pub extern crate aflak_imgui_sys as sys;
 
 use std::ffi::CStr;
 use std::mem;
@@ -360,7 +360,7 @@ impl ImGui {
     /// # Example
     ///
     /// ```rust
-    /// use imgui::{ImGuiKey, Ui};
+    /// use aflak_imgui::{ImGuiKey, Ui};
     ///
     /// fn test(ui: &Ui) {
     ///     let delete_key_index = ui.imgui().get_key_index(ImGuiKey::Delete);
@@ -960,8 +960,8 @@ impl<'ui> Ui<'ui> {
     /// # Examples
     ///
     /// ```
-    /// # #[macro_use] extern crate imgui;
-    /// # use imgui::*;
+    /// # #[macro_use] extern crate aflak_imgui;
+    /// # use aflak_imgui::*;
     /// fn user_interface(ui: &Ui) {
     ///     ui.text("Hover over me");
     ///     if ui.is_item_hovered() {
@@ -985,8 +985,8 @@ impl<'ui> Ui<'ui> {
     /// # Examples
     ///
     /// ```
-    /// # #[macro_use] extern crate imgui;
-    /// # use imgui::*;
+    /// # #[macro_use] extern crate aflak_imgui;
+    /// # use aflak_imgui::*;
     /// fn user_interface(ui: &Ui) {
     ///     ui.text("Hover over me");
     ///     if ui.is_item_hovered() {
@@ -1096,7 +1096,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
     /// # let mut selected_radio_value = 2;
@@ -1113,7 +1113,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
     /// # let mut radio_button_test = "cats".to_string();
@@ -1190,7 +1190,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
     /// ui.progress_bar(0.6)
@@ -1208,7 +1208,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
     /// ui.window(im_str!("ChatWindow"))
@@ -1244,12 +1244,12 @@ impl<'ui> Ui<'ui> {
     /// ## Example using glium as back-end
     ///
     /// ```rust,no_run
-    /// #[macro_use] extern crate imgui;
+    /// #[macro_use] extern crate aflak_imgui;
     /// extern crate glium;
-    /// extern crate imgui_glium_renderer;
+    /// extern crate aflak_imgui_glium_renderer;
     ///
-    /// use imgui::*;
-    /// use imgui_glium_renderer::Texture;
+    /// use aflak_imgui::*;
+    /// use aflak_imgui_glium_renderer::Texture;
     /// use glium::backend::Facade;
     ///
     /// fn make_a_texture<F: Facade>(ui: &Ui, facade: &F, data: Vec<Vec<(u8, u8, u8, u8)>>) {
@@ -1276,7 +1276,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
     /// ui.with_style_var(StyleVar::Alpha(0.2), || {
@@ -1294,7 +1294,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
     /// # let styles = [StyleVar::Alpha(0.2), StyleVar::WindowPadding(ImVec2::new(1.0, 1.0))];
@@ -1354,7 +1354,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
     /// ui.with_color_var(ImGuiCol::Text, (1.0, 0.0, 0.0, 1.0), || {
@@ -1380,7 +1380,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
     /// let red = (1.0, 0.0, 0.0, 1.0);
@@ -1430,8 +1430,8 @@ impl<'ui> Ui<'ui> {
     /// # Examples
     ///
     /// ```
-    /// # #[macro_use] extern crate imgui;
-    /// # use imgui::*;
+    /// # #[macro_use] extern crate aflak_imgui;
+    /// # use aflak_imgui::*;
     /// fn user_interface(ui: &Ui) {
     ///     ui.text("Hover over me");
     ///     let is_hover_over_me_text_hovered = ui.is_item_hovered();
@@ -1472,7 +1472,7 @@ impl<'ui> Ui<'ui> {
     /// # Examples
     ///
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// fn custom_draw(ui: &Ui) {
     ///     let draw_list = ui.get_window_draw_list();
     ///     // Draw a line
@@ -1487,7 +1487,7 @@ impl<'ui> Ui<'ui> {
     /// dropped.
     ///
     /// ```rust
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// fn custom_draw(ui: &Ui) {
     ///     let draw_list = ui.get_window_draw_list();
     ///     // Draw something...
@@ -1514,12 +1514,12 @@ impl<'ui> Ui<'ui> {
     /// ## Example using glium as back-end
     ///
     /// ```rust,no_run
-    /// #[macro_use] extern crate imgui;
+    /// #[macro_use] extern crate aflak_imgui;
     /// extern crate glium;
-    /// extern crate imgui_glium_renderer;
+    /// extern crate aflak_imgui_glium_renderer;
     ///
-    /// use imgui::*;
-    /// use imgui_glium_renderer::Texture;
+    /// use aflak_imgui::*;
+    /// use aflak_imgui_glium_renderer::Texture;
     /// use glium::backend::Facade;
     /// use glium::Texture2d;
     ///
@@ -1557,12 +1557,12 @@ impl<'ui> Ui<'ui> {
     /// ## Example using glium as back-end
     ///
     /// ```rust,no_run
-    /// #[macro_use] extern crate imgui;
+    /// #[macro_use] extern crate aflak_imgui;
     /// extern crate glium;
-    /// extern crate imgui_glium_renderer;
+    /// extern crate aflak_imgui_glium_renderer;
     ///
-    /// use imgui::*;
-    /// use imgui_glium_renderer::Texture;
+    /// use aflak_imgui::*;
+    /// use aflak_imgui_glium_renderer::Texture;
     /// use glium::backend::Facade;
     ///
     /// fn make_a_texture<F: Facade>(ui: &Ui, facade: &F, data: Vec<Vec<(u8, u8, u8, u8)>>) {
diff --git a/src/window_draw_list.rs b/src/window_draw_list.rs
index 5f44a424b..364f8f5c4 100644
--- a/src/window_draw_list.rs
+++ b/src/window_draw_list.rs
@@ -85,7 +85,7 @@ impl<'ui> WindowDrawList<'ui> {
     /// # Example
     ///
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// fn custom_drawing(ui: &Ui) {
     ///     let draw_list = ui.get_window_draw_list();
     ///     draw_list.channels_split(2, |channels| {