diff --git a/ImageControlLook.cpp b/ImageControlLook.cpp
index 877428e..68b0776 100644
--- a/ImageControlLook.cpp
+++ b/ImageControlLook.cpp
@@ -21,7 +21,7 @@ ImageControlLook::ImageControlLook(image_id id)
 	fSliderThumb.fill(NULL);
 	fSliderTriangle.fill(NULL);
 
-	fImageRoot = BPath("/boot/home/Desktop/projects/haiku/ImageControlLook/data/ImageThemes/OS-X-Leopard/");
+	fImageRoot = BPath("/boot/home/Desktop/projects/haiku/ImageControlLook/data/ImageThemes/Akva/");
 }
 
 
diff --git a/data/ImageThemes/OS-X-Leopard/Button/ActivatedLeft b/data/ImageThemes/Akva/Button/ActivatedLeft
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/ActivatedLeft
rename to data/ImageThemes/Akva/Button/ActivatedLeft
diff --git a/data/ImageThemes/OS-X-Leopard/Button/ActivatedMiddle b/data/ImageThemes/Akva/Button/ActivatedMiddle
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/ActivatedMiddle
rename to data/ImageThemes/Akva/Button/ActivatedMiddle
diff --git a/data/ImageThemes/OS-X-Leopard/Button/ActivatedRight b/data/ImageThemes/Akva/Button/ActivatedRight
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/ActivatedRight
rename to data/ImageThemes/Akva/Button/ActivatedRight
diff --git a/data/ImageThemes/OS-X-Leopard/Button/DisabledLeft b/data/ImageThemes/Akva/Button/DisabledLeft
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/DisabledLeft
rename to data/ImageThemes/Akva/Button/DisabledLeft
diff --git a/data/ImageThemes/OS-X-Leopard/Button/DisabledMiddle b/data/ImageThemes/Akva/Button/DisabledMiddle
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/DisabledMiddle
rename to data/ImageThemes/Akva/Button/DisabledMiddle
diff --git a/data/ImageThemes/OS-X-Leopard/Button/DisabledRight b/data/ImageThemes/Akva/Button/DisabledRight
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/DisabledRight
rename to data/ImageThemes/Akva/Button/DisabledRight
diff --git a/data/ImageThemes/OS-X-Leopard/Button/HoverLeft b/data/ImageThemes/Akva/Button/HoverLeft
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/HoverLeft
rename to data/ImageThemes/Akva/Button/HoverLeft
diff --git a/data/ImageThemes/OS-X-Leopard/Button/HoverMiddle b/data/ImageThemes/Akva/Button/HoverMiddle
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/HoverMiddle
rename to data/ImageThemes/Akva/Button/HoverMiddle
diff --git a/data/ImageThemes/OS-X-Leopard/Button/HoverRight b/data/ImageThemes/Akva/Button/HoverRight
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/HoverRight
rename to data/ImageThemes/Akva/Button/HoverRight
diff --git a/data/ImageThemes/OS-X-Leopard/Button/InactiveLeft b/data/ImageThemes/Akva/Button/InactiveLeft
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/InactiveLeft
rename to data/ImageThemes/Akva/Button/InactiveLeft
diff --git a/data/ImageThemes/OS-X-Leopard/Button/InactiveMiddle b/data/ImageThemes/Akva/Button/InactiveMiddle
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/InactiveMiddle
rename to data/ImageThemes/Akva/Button/InactiveMiddle
diff --git a/data/ImageThemes/OS-X-Leopard/Button/InactiveRight b/data/ImageThemes/Akva/Button/InactiveRight
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/InactiveRight
rename to data/ImageThemes/Akva/Button/InactiveRight
diff --git a/data/ImageThemes/OS-X-Leopard/Button/NormalLeft b/data/ImageThemes/Akva/Button/NormalLeft
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/NormalLeft
rename to data/ImageThemes/Akva/Button/NormalLeft
diff --git a/data/ImageThemes/OS-X-Leopard/Button/NormalMiddle b/data/ImageThemes/Akva/Button/NormalMiddle
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/NormalMiddle
rename to data/ImageThemes/Akva/Button/NormalMiddle
diff --git a/data/ImageThemes/OS-X-Leopard/Button/NormalRight b/data/ImageThemes/Akva/Button/NormalRight
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Button/NormalRight
rename to data/ImageThemes/Akva/Button/NormalRight
diff --git a/data/ImageThemes/OS-X-Leopard/CREDITS b/data/ImageThemes/Akva/CREDITS
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/CREDITS
rename to data/ImageThemes/Akva/CREDITS
diff --git a/data/ImageThemes/OS-X-Leopard/CheckBox-Checked/Activated b/data/ImageThemes/Akva/CheckBox-Checked/Activated
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/CheckBox-Checked/Activated
rename to data/ImageThemes/Akva/CheckBox-Checked/Activated
diff --git a/data/ImageThemes/OS-X-Leopard/CheckBox-Checked/Disabled b/data/ImageThemes/Akva/CheckBox-Checked/Disabled
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/CheckBox-Checked/Disabled
rename to data/ImageThemes/Akva/CheckBox-Checked/Disabled
diff --git a/data/ImageThemes/OS-X-Leopard/CheckBox-Checked/Hover b/data/ImageThemes/Akva/CheckBox-Checked/Hover
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/CheckBox-Checked/Hover
rename to data/ImageThemes/Akva/CheckBox-Checked/Hover
diff --git a/data/ImageThemes/OS-X-Leopard/CheckBox-Checked/Inactive b/data/ImageThemes/Akva/CheckBox-Checked/Inactive
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/CheckBox-Checked/Inactive
rename to data/ImageThemes/Akva/CheckBox-Checked/Inactive
diff --git a/data/ImageThemes/OS-X-Leopard/CheckBox-Checked/Normal b/data/ImageThemes/Akva/CheckBox-Checked/Normal
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/CheckBox-Checked/Normal
rename to data/ImageThemes/Akva/CheckBox-Checked/Normal
diff --git a/data/ImageThemes/OS-X-Leopard/CheckBox-Unchecked/Activated b/data/ImageThemes/Akva/CheckBox-Unchecked/Activated
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/CheckBox-Unchecked/Activated
rename to data/ImageThemes/Akva/CheckBox-Unchecked/Activated
diff --git a/data/ImageThemes/OS-X-Leopard/CheckBox-Unchecked/Disabled b/data/ImageThemes/Akva/CheckBox-Unchecked/Disabled
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/CheckBox-Unchecked/Disabled
rename to data/ImageThemes/Akva/CheckBox-Unchecked/Disabled
diff --git a/data/ImageThemes/OS-X-Leopard/CheckBox-Unchecked/Hover b/data/ImageThemes/Akva/CheckBox-Unchecked/Hover
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/CheckBox-Unchecked/Hover
rename to data/ImageThemes/Akva/CheckBox-Unchecked/Hover
diff --git a/data/ImageThemes/OS-X-Leopard/CheckBox-Unchecked/Inactive b/data/ImageThemes/Akva/CheckBox-Unchecked/Inactive
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/CheckBox-Unchecked/Inactive
rename to data/ImageThemes/Akva/CheckBox-Unchecked/Inactive
diff --git a/data/ImageThemes/OS-X-Leopard/CheckBox-Unchecked/Normal b/data/ImageThemes/Akva/CheckBox-Unchecked/Normal
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/CheckBox-Unchecked/Normal
rename to data/ImageThemes/Akva/CheckBox-Unchecked/Normal
diff --git a/data/ImageThemes/OS-X-Leopard/LICENSE.md b/data/ImageThemes/Akva/LICENSE.md
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/LICENSE.md
rename to data/ImageThemes/Akva/LICENSE.md
diff --git a/data/ImageThemes/OS-X-Leopard/Notes.txt b/data/ImageThemes/Akva/Notes.txt
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/Notes.txt
rename to data/ImageThemes/Akva/Notes.txt
diff --git a/data/ImageThemes/Akva/README.md b/data/ImageThemes/Akva/README.md
new file mode 100644
index 0000000..d11ab99
--- /dev/null
+++ b/data/ImageThemes/Akva/README.md
@@ -0,0 +1,4 @@
+# Akva ImageControlLook theme
+
+Based on [Elbullazul's](https://github.com/Elbullazul) OS-X-Leopard GTK theme,
+with tweaks here and there for Haiku.
diff --git a/data/ImageThemes/OS-X-Leopard/SliderBar/NormalLeft b/data/ImageThemes/Akva/SliderBar/NormalLeft
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/SliderBar/NormalLeft
rename to data/ImageThemes/Akva/SliderBar/NormalLeft
diff --git a/data/ImageThemes/OS-X-Leopard/SliderBar/NormalMiddle b/data/ImageThemes/Akva/SliderBar/NormalMiddle
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/SliderBar/NormalMiddle
rename to data/ImageThemes/Akva/SliderBar/NormalMiddle
diff --git a/data/ImageThemes/OS-X-Leopard/SliderBar/NormalRight b/data/ImageThemes/Akva/SliderBar/NormalRight
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/SliderBar/NormalRight
rename to data/ImageThemes/Akva/SliderBar/NormalRight
diff --git a/data/ImageThemes/Akva/SliderBar/README.txt b/data/ImageThemes/Akva/SliderBar/README.txt
new file mode 100644
index 0000000..ff31505
--- /dev/null
+++ b/data/ImageThemes/Akva/SliderBar/README.txt
@@ -0,0 +1 @@
+SliderBar isn't actually used by ImageControlLook, at least not for the time being.
diff --git a/data/ImageThemes/Akva/SliderThumb/Activated b/data/ImageThemes/Akva/SliderThumb/Activated
new file mode 100644
index 0000000..700c4f7
Binary files /dev/null and b/data/ImageThemes/Akva/SliderThumb/Activated differ
diff --git a/data/ImageThemes/Akva/SliderThumb/Disabled b/data/ImageThemes/Akva/SliderThumb/Disabled
new file mode 100644
index 0000000..1cfced0
Binary files /dev/null and b/data/ImageThemes/Akva/SliderThumb/Disabled differ
diff --git a/data/ImageThemes/Akva/SliderThumb/Hover b/data/ImageThemes/Akva/SliderThumb/Hover
new file mode 100644
index 0000000..c00a447
Binary files /dev/null and b/data/ImageThemes/Akva/SliderThumb/Hover differ
diff --git a/data/ImageThemes/Akva/SliderThumb/Inactive b/data/ImageThemes/Akva/SliderThumb/Inactive
new file mode 100644
index 0000000..4036202
Binary files /dev/null and b/data/ImageThemes/Akva/SliderThumb/Inactive differ
diff --git a/data/ImageThemes/Akva/SliderThumb/Normal b/data/ImageThemes/Akva/SliderThumb/Normal
new file mode 100644
index 0000000..41ffdc9
Binary files /dev/null and b/data/ImageThemes/Akva/SliderThumb/Normal differ
diff --git a/data/ImageThemes/OS-X-Leopard/SliderTriangle/Activated b/data/ImageThemes/Akva/SliderTriangle/Activated
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/SliderTriangle/Activated
rename to data/ImageThemes/Akva/SliderTriangle/Activated
diff --git a/data/ImageThemes/OS-X-Leopard/SliderTriangle/Disabled b/data/ImageThemes/Akva/SliderTriangle/Disabled
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/SliderTriangle/Disabled
rename to data/ImageThemes/Akva/SliderTriangle/Disabled
diff --git a/data/ImageThemes/OS-X-Leopard/SliderTriangle/Hover b/data/ImageThemes/Akva/SliderTriangle/Hover
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/SliderTriangle/Hover
rename to data/ImageThemes/Akva/SliderTriangle/Hover
diff --git a/data/ImageThemes/OS-X-Leopard/SliderTriangle/Inactive b/data/ImageThemes/Akva/SliderTriangle/Inactive
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/SliderTriangle/Inactive
rename to data/ImageThemes/Akva/SliderTriangle/Inactive
diff --git a/data/ImageThemes/OS-X-Leopard/SliderTriangle/Normal b/data/ImageThemes/Akva/SliderTriangle/Normal
similarity index 100%
rename from data/ImageThemes/OS-X-Leopard/SliderTriangle/Normal
rename to data/ImageThemes/Akva/SliderTriangle/Normal
diff --git a/data/ImageThemes/OS-X-Leopard/README.md b/data/ImageThemes/OS-X-Leopard/README.md
deleted file mode 100644
index ad4537d..0000000
--- a/data/ImageThemes/OS-X-Leopard/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# OS-X-Leopard ImageControlLook Theme
-
-Based on [Elbullazul's](https://github.com/Elbullazul) GTK theme on the same
-name, tweaked here and there for Haiku.
diff --git a/data/ImageThemes/OS-X-Leopard/SliderThumb/Activated b/data/ImageThemes/OS-X-Leopard/SliderThumb/Activated
deleted file mode 100644
index 8ec03ba..0000000
Binary files a/data/ImageThemes/OS-X-Leopard/SliderThumb/Activated and /dev/null differ
diff --git a/data/ImageThemes/OS-X-Leopard/SliderThumb/Disabled b/data/ImageThemes/OS-X-Leopard/SliderThumb/Disabled
deleted file mode 100644
index 8c1725e..0000000
Binary files a/data/ImageThemes/OS-X-Leopard/SliderThumb/Disabled and /dev/null differ
diff --git a/data/ImageThemes/OS-X-Leopard/SliderThumb/Hover b/data/ImageThemes/OS-X-Leopard/SliderThumb/Hover
deleted file mode 100644
index a61a1e1..0000000
Binary files a/data/ImageThemes/OS-X-Leopard/SliderThumb/Hover and /dev/null differ
diff --git a/data/ImageThemes/OS-X-Leopard/SliderThumb/Inactive b/data/ImageThemes/OS-X-Leopard/SliderThumb/Inactive
deleted file mode 100644
index e4ea795..0000000
Binary files a/data/ImageThemes/OS-X-Leopard/SliderThumb/Inactive and /dev/null differ
diff --git a/data/ImageThemes/OS-X-Leopard/SliderThumb/Normal b/data/ImageThemes/OS-X-Leopard/SliderThumb/Normal
deleted file mode 100755
index 2dcfd04..0000000
Binary files a/data/ImageThemes/OS-X-Leopard/SliderThumb/Normal and /dev/null differ