diff --git a/customtkinter/assets/themes/blue.json b/customtkinter/assets/themes/blue.json
index 449be59..4626513 100644
--- a/customtkinter/assets/themes/blue.json
+++ b/customtkinter/assets/themes/blue.json
@@ -1,16 +1,16 @@
 {
   "CTk": {
-    "fg_color": ["#EBEBEC", "#212325"]
+    "fg_color": ["gray92", "gray14"]
   },
   "CTkToplevel": {
-    "fg_color": ["#EBEBEC", "#212325"]
+    "fg_color": ["gray92", "gray14"]
   },
   "CTkFrame": {
     "corner_radius": 6,
     "border_width": 0,
-    "fg_color": ["#D1D5D8", "#2A2D2E"],
-    "top_fg_color": ["#C0C2C5", "#343638"],
-    "border_color": ["#979DA2", "#565B5E"]
+    "fg_color": ["gray86", "gray17"],
+    "top_fg_color": ["gray81", "gray20"],
+    "border_color": ["gray65", "gray28"]
   },
   "CTkButton": {
     "corner_radius": 6,
@@ -104,16 +104,16 @@
     "corner_radius": 1000,
     "border_spacing": 4,
     "fg_color": "transparent",
-    "button_color": ["#36719F", "#144870"],
-    "button_hover_color": ["#27577D", "#203A4F"]
+    "button_color": ["gray55", "gray41"],
+    "button_hover_color": ["gray40", "gray53"]
   },
   "CTkSegmentedButton": {
     "corner_radius": 6,
     "border_width": 2,
-    "fg_color": ["#979DA2", "#4A4D50"],
+    "fg_color": ["#979DA2", "gray29"],
     "selected_color": ["#3B8ED0", "#1F6AA5"],
     "selected_hover_color": ["#36719F", "#144870"],
-    "unselected_color": ["#979DA2", "#4A4D50"],
+    "unselected_color": ["#979DA2", "gray29"],
     "unselected_hover_color": ["gray70", "gray41"],
     "text_color": ["#DCE4EE", "#DCE4EE"],
     "text_color_disabled": ["gray74", "gray60"]
@@ -121,7 +121,7 @@
   "CTkTextbox": {
     "corner_radius": 6,
     "border_width": 0,
-    "fg_color": ["#F9F9FA", "#343638"],
+    "fg_color": ["#F9F9FA", "gray23"],
     "border_color": ["#979DA2", "#565B5E"],
     "text_color":["gray10", "#DCE4EE"],
     "scrollbar_button_color": ["gray55", "gray41"],
diff --git a/customtkinter/assets/themes/blue_old.json b/customtkinter/assets/themes/blue_old.json
deleted file mode 100644
index 2f5acc0..0000000
--- a/customtkinter/assets/themes/blue_old.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "color": {
-    "window": ["#EBEBEC", "#212325"],
-    "button": ["#3B8ED0", "#1F6AA5"],
-    "button_hover": ["#36719F", "#144870"],
-    "button_border": ["#3E454A", "#949A9F"],
-    "checkbox_border": ["#3E454A", "#949A9F"],
-    "checkmark": ["#DCE4EE", "gray90"],
-    "entry": ["#F9F9FA", "#343638"],
-    "entry_border": ["#979DA2", "#565B5E"],
-    "entry_placeholder_text": ["gray52", "gray62"],
-    "frame_border": ["#979DA2", "#565B5E"],
-    "frame_low": ["#D1D5D8", "#2A2D2E"],
-    "frame_high": ["#C0C2C5", "#343638"],
-    "label": "transparent",
-    "text": ["gray10", "#DCE4EE"],
-    "text_disabled": ["gray60", "gray45"],
-    "text_button": ["#DCE4EE", "#DCE4EE"],
-    "text_button_disabled": ["gray74", "gray60"],
-    "progressbar": ["#939BA2", "#4A4D50"],
-    "progressbar_progress": ["#3B8ED0", "#1F6AA5"],
-    "progressbar_border": ["gray", "gray"],
-    "slider": ["#939BA2", "#4A4D50"],
-    "slider_progress": ["gray40", "#AAB0B5"],
-    "slider_button": ["#3B8ED0", "#1F6AA5"],
-    "slider_button_hover": ["#36719F", "#144870"],
-    "switch": ["#939BA2", "#4A4D50"],
-    "switch_progress": ["#3B8ED0", "#1F6AA5"],
-    "switch_button": ["gray36", "#D5D9DE"],
-    "switch_button_hover": ["gray20", "gray100"],
-    "optionmenu_button": ["#36719F", "#144870"],
-    "optionmenu_button_hover": ["#27577D", "#203A4F"],
-    "combobox_border": ["#979DA2", "#565B5E"],
-    "combobox_button_hover": ["#6E7174", "#7A848D"],
-    "dropdown_color": ["gray90", "gray20"],
-    "dropdown_hover": ["gray75", "gray28"],
-    "dropdown_text": ["gray10", "#DCE4EE"],
-    "scrollbar_button": ["gray55", "gray41"],
-    "scrollbar_button_hover": ["gray40", "gray53"],
-    "segmented_button": ["#979DA2", "#4A4D50"],
-    "segmented_button_unselected": ["#979DA2", "#4A4D50"],
-    "segmented_button_unselected_hover": ["gray70", "gray41"]
-  },
-  "text": {
-    "macOS": {
-      "font": "SF Display",
-      "size": -13
-    },
-    "Windows": {
-      "font": "Roboto",
-      "size": -13
-    },
-    "Linux": {
-      "font": "Roboto",
-      "size": -13
-    }
-  },
-  "shape": {
-    "button_corner_radius": 6,
-    "button_border_width": 0,
-    "checkbox_corner_radius": 6,
-    "checkbox_border_width": 3,
-    "radiobutton_corner_radius": 1000,
-    "radiobutton_border_width_unchecked": 3,
-    "radiobutton_border_width_checked": 6,
-    "entry_border_width": 2,
-    "frame_corner_radius": 6,
-    "frame_border_width": 0,
-    "label_corner_radius": 0,
-    "progressbar_border_width": 0,
-    "progressbar_corner_radius": 1000,
-    "slider_border_width": 6,
-    "slider_corner_radius": 1000,
-    "slider_button_length": 0,
-    "slider_button_corner_radius": 1000,
-    "switch_border_width": 3,
-    "switch_corner_radius": 1000,
-    "switch_button_length": 0,
-    "scrollbar_corner_radius": 1000,
-    "scrollbar_border_spacing": 4
-  }
-}
diff --git a/customtkinter/assets/themes/green.json b/customtkinter/assets/themes/green.json
index d3e9442..1b28c75 100644
--- a/customtkinter/assets/themes/green.json
+++ b/customtkinter/assets/themes/green.json
@@ -1,79 +1,152 @@
 {
-  "color": {
-    "window_bg_color": ["gray92", "gray12"],
-    "button": ["#72CF9F", "#11B384"],
-    "button_hover": ["#0E9670", "#0D8A66"],
-    "button_border": ["gray40", "gray70"],
-    "checkbox_border": ["gray40", "gray60"],
-    "checkmark": ["white", "gray90"],
-    "entry": ["white", "gray24"],
-    "entry_border": ["gray70", "gray32"],
-    "entry_placeholder_text": ["gray52", "gray62"],
-    "frame_border": ["#A7C2E0", "#5FB4DD"],
-    "frame_low": ["gray87", "gray18"],
-    "frame_high": ["gray82", "gray22"],
-    "label": [null, null],
-    "text": ["gray20", "gray90"],
-    "text_disabled": ["gray60", "gray50"],
-    "text_button_disabled": ["gray40", "gray74"],
-    "progressbar": ["#6B6B6B", "#222222"],
-    "progressbar_progress": ["#72CF9F", "#11B384"],
-    "progressbar_border": ["gray", "gray"],
-    "slider": ["#6B6B6B", "#222222"],
-    "slider_progress": ["white", "#555555"],
-    "slider_button": ["#72CF9F", "#11B384"],
-    "slider_button_hover": ["#0E9670", "#0D8A66"],
-    "switch": ["gray70", "gray35"],
-    "switch_progress": ["#72CF9F", "#11B384"],
-    "switch_button": ["gray38", "gray70"],
-    "switch_button_hover": ["gray30", "gray90"],
-    "optionmenu_button": ["#0E9670", "#0D8A66"],
-    "optionmenu_button_hover":["gray40", "gray70"],
-    "combobox_border": ["gray70", "gray32"],
-    "combobox_button_hover": ["#6E7174", "#7A848D"],
-    "dropdown_color": ["gray90", "gray20"],
-    "dropdown_hover": ["gray75", "gray28"],
-    "dropdown_text": ["gray10", "#DCE4EE"],
-    "scrollbar_button": ["gray55", "gray41"],
-    "scrollbar_button_hover": ["gray40", "gray53"]
+  "CTk": {
+    "fg_color": ["gray92", "gray14"]
   },
-  "text": {
+  "CTkToplevel": {
+    "fg_color": ["gray92", "gray14"]
+  },
+  "CTkFrame": {
+    "corner_radius": 6,
+    "border_width": 0,
+    "fg_color": ["gray86", "gray17"],
+    "top_fg_color": ["gray81", "gray20"],
+    "border_color": ["gray65", "gray28"]
+  },
+  "CTkButton": {
+    "corner_radius": 6,
+    "border_width": 0,
+    "fg_color": ["#2CC985", "#2FA572"],
+    "hover_color": ["#0C955A", "#106A43"],
+    "border_color": ["#3E454A", "#949A9F"],
+    "text_color": ["gray98", "#DCE4EE"],
+    "text_color_disabled": ["gray78", "gray68"]
+  },
+  "CTkLabel": {
+    "corner_radius": 0,
+    "fg_color": "transparent",
+    "text_color": ["gray10", "#DCE4EE"]
+  },
+  "CTkEntry": {
+    "corner_radius": 6,
+    "border_width": 2,
+    "fg_color": ["#F9F9FA", "#343638"],
+    "border_color": ["#979DA2", "#565B5E"],
+    "text_color":["gray10", "#DCE4EE"],
+    "placeholder_text_color": ["gray52", "gray62"]
+  },
+  "CTkCheckbox": {
+    "corner_radius": 6,
+    "border_width": 3,
+    "fg_color": ["#2CC985", "#2FA572"],
+    "border_color": ["#3E454A", "#949A9F"],
+    "hover_color": ["#0C955A", "#106A43"],
+    "checkmark_color": ["#DCE4EE", "gray90"],
+    "text_color": ["gray10", "#DCE4EE"],
+    "text_color_disabled": ["gray60", "gray45"]
+  },
+  "CTkSwitch": {
+    "corner_radius": 1000,
+    "border_width": 3,
+    "button_length": 0,
+    "fg_Color": ["#939BA2", "#4A4D50"],
+    "progress_color": ["#2CC985", "#2FA572"],
+    "button_color": ["gray36", "#D5D9DE"],
+    "button_hover_color": ["gray20", "gray100"],
+    "text_color": ["gray10", "#DCE4EE"],
+    "text_color_disabled": ["gray60", "gray45"]
+  },
+  "CTkRadiobutton": {
+    "corner_radius": 1000,
+    "border_width_checked": 6,
+    "border_width_unchecked": 3,
+    "fg_color": ["#2CC985", "#2FA572"],
+    "border_color": ["#3E454A", "#949A9F"],
+    "hover_color":["#0C955A", "#106A43"],
+    "text_color": ["gray10", "#DCE4EE"],
+    "text_color_disabled": ["gray60", "gray45"]
+  },
+  "CTkProgressBar": {
+    "corner_radius": 1000,
+    "border_width": 0,
+    "fg_color": ["#939BA2", "#4A4D50"],
+    "progress_color": ["#2CC985", "#2FA572"],
+    "border_color": ["gray", "gray"]
+  },
+  "CTkSlider": {
+    "corner_radius": 1000,
+    "button_corner_radius": 1000,
+    "border_width": 6,
+    "button_length": 0,
+    "fg_color": ["#939BA2", "#4A4D50"],
+    "progress_color": ["gray40", "#AAB0B5"],
+    "button_color": ["#2CC985", "#2FA572"],
+    "button_hover_color": ["#0C955A", "#106A43"]
+  },
+  "CTkOptionMenu": {
+    "corner_radius": 6,
+    "fg_color": ["#2cbe79", "#2FA572"],
+    "button_color": ["#0C955A", "#106A43"],
+    "button_hover_color": ["#0b6e3d", "#17472e"],
+    "text_color": ["gray98", "#DCE4EE"],
+    "text_color_disabled": ["gray78", "gray68"]
+  },
+  "CTkComboBox": {
+    "corner_radius": 6,
+    "border_width": 2,
+    "fg_color": ["#F9F9FA", "#343638"],
+    "border_color": ["#979DA2", "#565B5E"],
+    "button_color": ["#979DA2", "#565B5E"],
+    "button_hover_color": ["#6E7174", "#7A848D"],
+    "text_color": ["gray10", "#DCE4EE"],
+    "text_color_disabled": ["gray50", "gray45"]
+  },
+  "CTkScrollbar": {
+    "corner_radius": 1000,
+    "border_spacing": 4,
+    "fg_color": "transparent",
+    "button_color": ["gray55", "gray41"],
+    "button_hover_color": ["gray40", "gray53"]
+  },
+  "CTkSegmentedButton": {
+    "corner_radius": 6,
+    "border_width": 2,
+    "fg_color": ["#979DA2", "gray29"],
+    "selected_color": ["#2CC985", "#2FA572"],
+    "selected_hover_color": ["#0C955A", "#106A43"],
+    "unselected_color": ["#979DA2", "gray29"],
+    "unselected_hover_color": ["gray70", "gray41"],
+    "text_color": ["gray98", "#DCE4EE"],
+    "text_color_disabled": ["gray78", "gray68"]
+  },
+  "CTkTextbox": {
+    "corner_radius": 6,
+    "border_width": 0,
+    "fg_color": ["#F9F9FA", "gray23"],
+    "border_color": ["#979DA2", "#565B5E"],
+    "text_color":["gray10", "#DCE4EE"],
+    "scrollbar_button_color": ["gray55", "gray41"],
+    "scrollbar_button_hover_color": ["gray40", "gray53"]
+  },
+  "DropdownMenu": {
+    "fg_color": ["gray90", "gray20"],
+    "hover_color": ["gray75", "gray28"],
+    "text_color": ["#DCE4EE", "#DCE4EE"]
+  },
+  "CTkFont": {
     "macOS": {
-      "font": "SF Display",
-      "size": -13
+      "family": "SF Display",
+      "size": 13,
+      "weight": "normal"
     },
     "Windows": {
-      "font": "Roboto",
-      "size": -13
+      "family": "Roboto",
+      "size": 13,
+      "weight": "normal"
     },
     "Linux": {
-      "font": "Roboto",
-      "size": -13
+      "family": "Roboto",
+      "size": 13,
+      "weight": "normal"
     }
-  },
-  "shape": {
-    "button_corner_radius": 6,
-    "button_border_width": 0,
-    "checkbox_corner_radius": 7,
-    "checkbox_border_width": 3,
-    "radiobutton_corner_radius": 1000,
-    "radiobutton_border_width_unchecked": 3,
-    "radiobutton_border_width_checked": 6,
-    "entry_border_width": 2,
-    "frame_corner_radius": 10,
-    "frame_border_width": 0,
-    "label_corner_radius": 0,
-    "progressbar_border_width": 0,
-    "progressbar_corner_radius": 1000,
-    "slider_border_width": 6,
-    "slider_corner_radius": 8,
-    "slider_button_length": 0,
-    "slider_button_corner_radius": 1000,
-    "switch_border_width": 3,
-    "switch_corner_radius": 1000,
-    "switch_button_corner_radius": 1000,
-    "switch_button_length": 0,
-    "scrollbar_corner_radius": 1000,
-    "scrollbar_border_spacing": 4
   }
 }
diff --git a/customtkinter/assets/themes/sweetkind.json b/customtkinter/assets/themes/sweetkind.json
deleted file mode 100644
index 178fec1..0000000
--- a/customtkinter/assets/themes/sweetkind.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "color": {
-    "window_bg_color": ["#ebf0f5", "#181b28"],
-    "button": ["#e46bff", "#212435"],
-    "button_hover": ["#8593d6", "#171926"],
-    "button_border": ["#525983", "#080b12"],
-    "checkbox_border": ["#01e9c4", "#01e9c4"],
-    "checkmark": ["#01e9c4", "#01e9c4"],
-    "entry": ["#dee2e7", "#212435"],
-    "entry_border": ["#fa00d0", "#080b12"],
-    "entry_placeholder_text": ["#cdc8ce", "#cdc8ce"],
-    "frame_border": ["#525983", "#10121f"],
-    "frame_low": ["#dee2e7", "#181b28"],
-    "frame_high": ["#dee2e7", "#1b1e2d"],
-    "label": [null, null],
-    "text": ["#0c0e14", "#cdc8ce"],
-    "text_disabled": ["#5e6062", "#7a8894"],
-    "text_button_disabled": ["#7a8894", "#7a8894"],
-    "progressbar": ["#fa00d0", "#fa00d0"],
-    "progressbar_progress": ["#363844", "#363844"],
-    "progressbar_border": ["#fa00d0", "#0d101f"],
-    "slider": ["#fa00d0", "#fa00d0"],
-    "slider_progress": ["#0d101f", "#0d101f"],
-    "slider_button": ["#fa00d0", "#fa00d0"],
-    "slider_button_hover": ["#e46bff", "#fa00d0"],
-    "switch": ["#7681be", "#1f2233"],
-    "switch_progress": ["#00e6c3", "#00e6c3"],
-    "switch_button": ["#525983", "#2e324a"],
-    "switch_button_hover": ["#fa00d0", "#2e324a"],
-    "optionmenu_button": ["#525983", "#080b12"],
-    "optionmenu_button_hover": ["#fa00d0", "#080b12"],
-    "combobox_border": ["#525983", "#080b12"],
-    "combobox_button_hover": ["#fa00d0", "#fa00d0"],
-    "dropdown_color": ["#dee2e7", "#212435"],
-    "dropdown_hover": ["#fa00d0", "#fa00d0"],
-    "dropdown_text": ["#0c0e14", "#cdc8ce"],
-    "scrollbar_button": ["#fa00d0", "#fa00d0"],
-    "scrollbar_button_hover": ["#9b45ff", "#9b45ff"]
-  },
-  "text": {
-    "macOS": {
-      "font": "SF Display",
-      "size": -13
-    },
-    "Windows": {
-      "font": "Roboto",
-      "size": -13
-    },
-    "Linux": {
-      "font": "Roboto",
-      "size": -13
-    }
-  },
-  "shape": {
-    "button_corner_radius": 8,
-    "button_border_width": 1,
-    "checkbox_corner_radius": 7,
-    "checkbox_border_width": 1,
-    "radiobutton_corner_radius": 1000,
-    "radiobutton_border_width_unchecked": 2,
-    "radiobutton_border_width_checked": 6,
-    "entry_border_width": 1,
-    "frame_corner_radius": 10,
-    "frame_border_width": 1,
-    "label_corner_radius": 3,
-    "progressbar_border_width": 2,
-    "progressbar_corner_radius": 1000,
-    "slider_border_width": 6,
-    "slider_corner_radius": 8,
-    "slider_button_length": 0,
-    "slider_button_corner_radius": 1000,
-    "switch_border_width": 3,
-    "switch_corner_radius": 1000,
-    "switch_button_corner_radius": 1000,
-    "switch_button_length": 2,
-    "scrollbar_corner_radius": 1000,
-    "scrollbar_border_spacing": 4
-  }
-}
diff --git a/test/manual_integration_tests/test_theme colors.py b/test/manual_integration_tests/test_theme_colors.py
similarity index 98%
rename from test/manual_integration_tests/test_theme colors.py
rename to test/manual_integration_tests/test_theme_colors.py
index 1f33104..e1fe20c 100644
--- a/test/manual_integration_tests/test_theme colors.py	
+++ b/test/manual_integration_tests/test_theme_colors.py
@@ -16,7 +16,7 @@ def create_all_widgets(master, state="normal"):
     progressbar_1 = customtkinter.CTkProgressBar(master=master)
     progressbar_1.pack(pady=10, padx=10)
 
-    button_1 = customtkinter.CTkButton(master=master, state=state)
+    button_1 = customtkinter.CTkButton(master=master, state=state, border_width=0)
     button_1.pack(pady=10, padx=10)
 
     slider_1 = customtkinter.CTkSlider(master=master, from_=0, to=1, state=state)
@@ -55,7 +55,7 @@ def create_all_widgets(master, state="normal"):
     segmented_button_1 = customtkinter.CTkSegmentedButton(master=master, values=["CTkSegmentedButton", "Value 2"], state=state)
     segmented_button_1.pack(pady=10, padx=10)
 
-    tabview_1 = customtkinter.CTkTabview(master=master, width=200, height=100, state=state)
+    tabview_1 = customtkinter.CTkTabview(master=master, width=200, height=100, state=state, border_width=2)
     tabview_1.pack(pady=10, padx=10)
     tabview_1.add("CTkTabview")
     tabview_1.add("Tab 2")