diff --git a/Cargo.toml b/Cargo.toml
index 9fce090ae..e889b3f4e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,23 +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 }
-imgui-glium-renderer = { path = "imgui-glium-renderer" }
+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"]
+members = ["imgui-examples", "imgui-sys", "imgui-gfx-renderer", "imgui-glium-renderer"]
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/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 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 cbbeb2143..f46698f07 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 99f153b0b..22627ed77 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 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 221cc2cd5..44f6c9e41 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 im_texture;
 pub use im_texture::Texture;
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 2f585646d..d2a984e01 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;
@@ -387,7 +387,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);
@@ -1132,8 +1132,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() {
@@ -1157,8 +1157,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() {
@@ -1274,7 +1274,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
     /// # let mut selected_radio_value = 2;
@@ -1291,7 +1291,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
     /// # let mut radio_button_test = "cats".to_string();
@@ -1370,7 +1370,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
     /// ui.progress_bar(0.6)
@@ -1388,7 +1388,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
     /// ui.window(im_str!("ChatWindow"))
@@ -1424,12 +1424,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)>>) {
@@ -1456,7 +1456,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
     /// ui.with_style_var(StyleVar::Alpha(0.2), || {
@@ -1474,7 +1474,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
     /// # let styles = [StyleVar::Alpha(0.2), StyleVar::WindowPadding(ImVec2::new(1.0, 1.0))];
@@ -1524,7 +1524,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
     /// ui.with_color_var(ImGuiCol::Text, (1.0, 0.0, 0.0, 1.0), || {
@@ -1550,7 +1550,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// # Example
     /// ```rust,no_run
-    /// # use imgui::*;
+    /// # use aflak_imgui::*;
     /// # let mut imgui = ImGui::init();
     /// # let ui = imgui.frame(FrameSize::new(100.0, 100.0, 1.0), 0.1);
     /// let red = (1.0, 0.0, 0.0, 1.0);
@@ -1600,8 +1600,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();
@@ -1644,7 +1644,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
@@ -1659,7 +1659,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...
@@ -1686,12 +1686,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;
     ///
@@ -1729,12 +1729,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 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| {