diff --git a/Cargo.toml b/Cargo.toml
index 916efbff9..ad2d2e563 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,19 +1,22 @@
 [package]
-name = "imgui"
-version = "0.0.21-pre"
-authors = ["Joonas Javanainen <joonas.javanainen@gmail.com>", "imgui-rs contributors"]
+name = "aflak_imgui"
+version = "0.20.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.21-pre", path = "imgui-sys" }
+aflak_imgui-sys = { version = "0.20.1", path = "imgui-sys" }
+
+[dev-dependencies]
+glium = { version = "0.22", default-features = true }
+aflak_imgui-glium-renderer = { path = "imgui-glium-renderer", version = "0.20.1" }
 
 [workspace]
 members = ["imgui-examples", "imgui-sys", "imgui-gfx-renderer", "imgui-glium-renderer", "imgui-glutin-support"]
diff --git a/imgui-examples/Cargo.toml b/imgui-examples/Cargo.toml
index 0c8a168a7..ad101f20c 100644
--- a/imgui-examples/Cargo.toml
+++ b/imgui-examples/Cargo.toml
@@ -13,6 +13,6 @@ gfx = "0.17"
 gfx_window_glutin = "0.26"
 glium = { version = "0.22", default-features = true }
 glutin = "0.18"
-imgui = { version = "0.0.21-pre", path = "../" }
+aflak_imgui = { version = "0.20.1", path = "../" }
 imgui-gfx-renderer = { version = "0.0.21-pre", path = "../imgui-gfx-renderer" }
-imgui-glium-renderer = { version = "0.0.21-pre", path = "../imgui-glium-renderer" }
+aflak_imgui-glium-renderer = { version = "0.20.1", path = "../imgui-glium-renderer" }
diff --git a/imgui-examples/examples/color_button.rs b/imgui-examples/examples/color_button.rs
index 6a0a3d769..83a78324a 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/hello_gfx.rs b/imgui-examples/examples/hello_gfx.rs
index 40423c3b0..8306c321c 100644
--- a/imgui-examples/examples/hello_gfx.rs
+++ b/imgui-examples/examples/hello_gfx.rs
@@ -2,7 +2,7 @@ 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;
 
 use imgui::*;
diff --git a/imgui-examples/examples/hello_world.rs b/imgui-examples/examples/hello_world.rs
index fd98eaffa..bea8d1a25 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..8611ccfeb 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 aflak_imgui as imgui;
+extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
 extern crate glium;
-extern crate imgui;
-extern crate imgui_glium_renderer;
 
 mod support;
 
diff --git a/imgui-examples/examples/test_window.rs b/imgui-examples/examples/test_window.rs
index d1114164e..67ae6153c 100644
--- a/imgui-examples/examples/test_window.rs
+++ b/imgui-examples/examples/test_window.rs
@@ -1,6 +1,6 @@
+extern crate aflak_imgui as imgui;
+extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
 extern crate glium;
-extern crate imgui;
-extern crate imgui_glium_renderer;
 
 mod support;
 
diff --git a/imgui-examples/examples/test_window_impl.rs b/imgui-examples/examples/test_window_impl.rs
index 979f840df..25c625147 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 878d4e631..4c5fb2f1d 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.21-pre", path = "../" }
-imgui-sys = { version = "0.0.21-pre", path = "../imgui-sys", features = ["gfx"] }
+aflak_imgui = { version = "0.20.1", path = "../" }
+aflak_imgui-sys = { version = "0.20.1", path = "../imgui-sys", features = ["gfx"] }
diff --git a/imgui-gfx-renderer/src/lib.rs b/imgui-gfx-renderer/src/lib.rs
index 97437cc51..ba1cd6f58 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;
 
 use gfx::handle::{Buffer, RenderTargetView};
 use gfx::memory::Bind;
diff --git a/imgui-glium-renderer/Cargo.toml b/imgui-glium-renderer/Cargo.toml
index 6b3334b62..d59a78e6f 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.21-pre"
+name = "aflak_imgui-glium-renderer"
+version = "0.20.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.22", default-features = false }
-imgui = { version = "0.0.21-pre", path = "../" }
-imgui-sys = { version = "0.0.21-pre", path = "../imgui-sys", features = ["glium"] }
+aflak_imgui = { version = "0.20.1", path = "../" }
+aflak_imgui-sys = { version = "0.20.1", path = "../imgui-sys", features = ["glium"] }
diff --git a/imgui-glium-renderer/src/lib.rs b/imgui-glium-renderer/src/lib.rs
index 90911033c..ccd437959 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;
 
 use glium::backend::{Context, Facade};
 use glium::index::{self, PrimitiveType};
diff --git a/imgui-glutin-support/Cargo.toml b/imgui-glutin-support/Cargo.toml
index 3051fbf4b..28a009fba 100644
--- a/imgui-glutin-support/Cargo.toml
+++ b/imgui-glutin-support/Cargo.toml
@@ -13,4 +13,4 @@ travis-ci = { repository = "Gekkio/imgui-rs" }
 
 [dependencies]
 glutin = ">= 0.17, <= 0.18"
-imgui = { version = "0.0.21-pre", path = "../" }
+aflak_imgui = { version = "0.20.1", path = "../" }
diff --git a/imgui-glutin-support/src/lib.rs b/imgui-glutin-support/src/lib.rs
index 7372ef531..11f083579 100644
--- a/imgui-glutin-support/src/lib.rs
+++ b/imgui-glutin-support/src/lib.rs
@@ -5,7 +5,7 @@
 //! In your initialization code call `configure_keys`:
 //!
 //! ```rust,no_run
-//! # extern crate imgui;
+//! # extern crate aflak_imgui as imgui;
 //! # extern crate imgui_glutin_support;
 //! use imgui::ImGui;
 //!
@@ -20,7 +20,7 @@
 //!
 //! ```rust,no_run
 //! # extern crate glutin;
-//! # extern crate imgui;
+//! # extern crate aflak_imgui as imgui;
 //! # extern crate imgui_glutin_support;
 //! # use glutin::EventsLoop;
 //! # use imgui::ImGui;
@@ -44,7 +44,7 @@
 //!
 //! ```rust,no_run
 //! # extern crate glutin;
-//! # extern crate imgui;
+//! # extern crate aflak_imgui as imgui;
 //! # extern crate imgui_glutin_support;
 //! # use glutin::{EventsLoop, Event, WindowEvent, MouseScrollDelta, TouchPhase};
 //! # use imgui::ImGui;
@@ -75,8 +75,8 @@
 //! # }
 //! ```
 
+extern crate aflak_imgui as imgui;
 extern crate glutin;
-extern crate imgui;
 
 use glutin::{
     ElementState, Event, KeyboardInput, ModifiersState, MouseButton, MouseCursor, MouseScrollDelta,
diff --git a/imgui-sys/Cargo.toml b/imgui-sys/Cargo.toml
index b00b0d477..cf8f56960 100644
--- a/imgui-sys/Cargo.toml
+++ b/imgui-sys/Cargo.toml
@@ -1,17 +1,14 @@
 [package]
-name = "imgui-sys"
-version = "0.0.21-pre"
+name = "aflak_imgui-sys"
+version = "0.20.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 c16ea677e..5598e4d45 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,6 +360,7 @@ impl ImGui {
     /// # Example
     ///
     /// ```rust
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// use imgui::{ImGuiKey, Ui};
     ///
     /// fn test(ui: &Ui) {
@@ -1126,7 +1127,7 @@ impl<'ui> Ui<'ui> {
     /// # Examples
     ///
     /// ```
-    /// # #[macro_use] extern crate imgui;
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// fn user_interface(ui: &Ui) {
     ///     ui.text("Hover over me");
@@ -1151,7 +1152,7 @@ impl<'ui> Ui<'ui> {
     /// # Examples
     ///
     /// ```
-    /// # #[macro_use] extern crate imgui;
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// fn user_interface(ui: &Ui) {
     ///     ui.text("Hover over me");
@@ -1216,6 +1217,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1290,6 +1292,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1307,6 +1310,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1396,6 +1400,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1414,6 +1419,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1444,6 +1450,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1462,6 +1469,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1512,6 +1520,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1538,6 +1547,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
@@ -1588,7 +1598,7 @@ impl<'ui> Ui<'ui> {
     /// # Examples
     ///
     /// ```
-    /// # #[macro_use] extern crate imgui;
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// fn user_interface(ui: &Ui) {
     ///     ui.text("Hover over me");
@@ -1647,6 +1657,7 @@ impl<'ui> Ui<'ui> {
     /// # Examples
     ///
     /// ```rust,no_run
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// fn custom_draw(ui: &Ui) {
     ///     let draw_list = ui.get_window_draw_list();
@@ -1662,6 +1673,7 @@ impl<'ui> Ui<'ui> {
     /// dropped.
     ///
     /// ```rust
+    /// # #[macro_use] extern crate aflak_imgui as imgui;
     /// # use imgui::*;
     /// fn custom_draw(ui: &Ui) {
     ///     let draw_list = ui.get_window_draw_list();
diff --git a/src/window_draw_list.rs b/src/window_draw_list.rs
index e181d973b..4cf9f0599 100644
--- a/src/window_draw_list.rs
+++ b/src/window_draw_list.rs
@@ -99,7 +99,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| {