diff --git a/build.sh b/build.sh
index 782f306..129a714 100644
--- a/build.sh
+++ b/build.sh
@@ -37,7 +37,7 @@ names["Notwaita-White"]=$(with_version "White Notwaita")
 # Cleanup old builds
 rm -rf themes bin
 
-# Building Apple XCursor binaries
+# Building Notwaita XCursor binaries
 for key in "${!names[@]}"; do
   comment="${names[$key]}"
   cfg=$(get_config_file key)
@@ -47,7 +47,7 @@ for key in "${!names[@]}"; do
   wait $PID
 done
 
-# Building macOS Windows binaries
+# Building Notwaita Windows binaries
 for key in "${!names[@]}"; do
   comment="${names[$key]}"
   cfg=$(get_config_file key)
@@ -69,13 +69,13 @@ for key in "${!names[@]}"; do
   wait $PID
 done
 
-# Compressing macOS.tar.xz
+# Compressing Notwaita.tar.xz
 cp ../LICENSE .
-tar -cJvf "../bin/macOS.tar.xz" --exclude="*-Windows" . &
+tar -cJvf "../bin/Notwaita.tar.xz" --exclude="*-Windows" . &
 PID=$!
 wait $PID
 
-# Compressing macOS-*-Windows
+# Compressing Notwaita-*-Windows
 for key in "${!names[@]}"; do
   zip -rv "../bin/${key}-Windows.zip" "${key}-Regular-Windows" "${key}-Large-Windows" "${key}-Extra-Large-Windows" &
   PID=$!
diff --git a/configs/win_lg.build.toml b/configs/win_lg.build.toml
index caf1fbd..d4045c4 100644
--- a/configs/win_lg.build.toml
+++ b/configs/win_lg.build.toml
@@ -17,126 +17,128 @@ win_delay = 1
 
 [cursors.all-scroll]
 png = 'move.png'
-x_hotspot = 126
-y_hotspot = 114
+x_hotspot = 133
+y_hotspot = 71
 win_name = 'Move'
 
 [cursors.bottom_left_corner]
 png = 'bottom_left_corner.png'
-x_hotspot = 61
-y_hotspot = 189
+x_hotspot = 62
+y_hotspot = 186
 win_name = 'Dng2'
 
 [cursors.bottom_right_corner]
 png = 'bottom_right_corner.png'
-x_hotspot = 192
-y_hotspot = 189
+x_hotspot = 187
+y_hotspot = 188
 win_name = 'Dng1'
 
 [cursors.cross]
 png = 'cross.png'
+x_hotspot = 114
+y_hotspot = 112
 win_name = 'Cross'
 
 [cursors.crossed_circle]
 png = 'crossed_circle.png'
-x_hotspot = 56
-y_hotspot = 17
+x_hotspot = 121
+y_hotspot = 126
 win_name = 'Unavailiable'
 
 [cursors.hand1]
 png = 'hand1.png'
-x_hotspot = 140
-y_hotspot = 58
+x_hotspot = 132
+y_hotspot = 117
 win_name = 'Pan'
 
 [cursors.hand2]
 png = 'hand2.png'
-x_hotspot = 95
-y_hotspot = 56
+x_hotspot = 93
+y_hotspot = 42
 win_name = 'Link'
 
 [cursors.left_ptr]
 png = 'left_ptr.png'
-x_hotspot = 36
-y_hotspot = 26
+x_hotspot = 37
+y_hotspot = 24
 win_name = 'Pointer'
 
 [cursors.left_ptr_watch]
 png = 'left_ptr_watch-*.png'
-x_hotspot = 36
-y_hotspot = 36
+x_hotspot = 35
+y_hotspot = 34
 win_sizes = "78:96"
 win_name = 'Work'
 
 [cursors.grabbing]
 png = 'dnd-none.png'
-x_hotspot = 128
-y_hotspot = 66
+x_hotspot = 135
+y_hotspot = 78
 win_name = 'Grabbing'
 
 [cursors.pencil]
 png = 'pencil.png'
-x_hotspot = 70
-y_hotspot = 213
+x_hotspot = 61
+y_hotspot = 232
 win_name = 'Handwriting'
 
 [cursors.question_arrow]
 png = 'question_arrow.png'
-x_hotspot = 121
-y_hotspot = 172
+x_hotspot = 123
+y_hotspot = 61
 win_name = 'Help'
 
 [cursors.right_ptr]
 png = 'right_ptr.png'
-x_hotspot = 216
-y_hotspot = 24
+x_hotspot = 215
+y_hotspot = 25
 win_name = 'Alternate'
 
 [cursors.sb_h_double_arrow]
 png = 'sb_h_double_arrow.png'
-x_hotspot = 126
-y_hotspot = 119
+x_hotspot = 127
+y_hotspot = 118
 win_name = 'Horz'
 
 [cursors.sb_v_double_arrow]
 png = 'sb_v_double_arrow.png'
-x_hotspot = 121
-y_hotspot = 123
+x_hotspot = 120
+y_hotspot = 122
 win_name = 'Vert'
 
 [cursors.wait]
 png = 'watch-*.png'
-x_hotspot = 127
-y_hotspot = 124
+x_hotspot = 126
+y_hotspot = 126
 win_sizes = "78:96"
 win_name = 'Busy'
 
 [cursors.xterm]
 png = 'xterm.png'
 x_hotspot = 110
-y_hotspot = 125
+y_hotspot = 119
 win_name = 'Text'
 
-[cursors.zoom_in]
+[cursors.zoom-in]
 png = 'zoom-in.png'
-x_hotspot = 110
+x_hotspot = 109
 y_hotspot = 108
 win_name = 'Zoom-in'
 
-[cursors.zoom_out]
+[cursors.zoom-out]
 png = 'zoom-out.png'
-x_hotspot = 110
+x_hotspot = 109
 y_hotspot = 108
 win_name = 'Zoom-out'
 
 [cursors.person]
 png = 'person.png'
 x_hotspot = 36
-y_hotspot = 25
+y_hotspot = 26
 win_name = 'Person'
 
 [cursors.pin]
 png = 'pin.png'
 x_hotspot = 36
-y_hotspot = 25
+y_hotspot = 26
 win_name = 'Pin'
diff --git a/configs/win_rg.build.toml b/configs/win_rg.build.toml
index 84e2095..d1f2d79 100644
--- a/configs/win_rg.build.toml
+++ b/configs/win_rg.build.toml
@@ -17,126 +17,128 @@ win_delay = 1
 
 [cursors.all-scroll]
 png = 'move.png'
-x_hotspot = 126
-y_hotspot = 114
+x_hotspot = 133
+y_hotspot = 71
 win_name = 'Move'
 
 [cursors.bottom_left_corner]
 png = 'bottom_left_corner.png'
-x_hotspot = 61
-y_hotspot = 189
+x_hotspot = 62
+y_hotspot = 186
 win_name = 'Dng2'
 
 [cursors.bottom_right_corner]
 png = 'bottom_right_corner.png'
-x_hotspot = 192
-y_hotspot = 189
+x_hotspot = 187
+y_hotspot = 188
 win_name = 'Dng1'
 
 [cursors.cross]
 png = 'cross.png'
+x_hotspot = 114
+y_hotspot = 112
 win_name = 'Cross'
 
 [cursors.crossed_circle]
 png = 'crossed_circle.png'
-x_hotspot = 56
-y_hotspot = 17
+x_hotspot = 121
+y_hotspot = 126
 win_name = 'Unavailiable'
 
 [cursors.hand1]
 png = 'hand1.png'
-x_hotspot = 140
-y_hotspot = 58
+x_hotspot = 132
+y_hotspot = 117
 win_name = 'Pan'
 
 [cursors.hand2]
 png = 'hand2.png'
-x_hotspot = 95
-y_hotspot = 56
+x_hotspot = 93
+y_hotspot = 42
 win_name = 'Link'
 
 [cursors.left_ptr]
 png = 'left_ptr.png'
-x_hotspot = 36
-y_hotspot = 26
+x_hotspot = 37
+y_hotspot = 24
 win_name = 'Pointer'
 
 [cursors.left_ptr_watch]
 png = 'left_ptr_watch-*.png'
-x_hotspot = 36
-y_hotspot = 36
+x_hotspot = 35
+y_hotspot = 34
 win_sizes = "64:96"
 win_name = 'Work'
 
 [cursors.grabbing]
 png = 'dnd-none.png'
-x_hotspot = 128
-y_hotspot = 66
+x_hotspot = 135
+y_hotspot = 78
 win_name = 'Grabbing'
 
 [cursors.pencil]
 png = 'pencil.png'
-x_hotspot = 70
-y_hotspot = 213
+x_hotspot = 61
+y_hotspot = 232
 win_name = 'Handwriting'
 
 [cursors.question_arrow]
 png = 'question_arrow.png'
-x_hotspot = 121
-y_hotspot = 172
+x_hotspot = 123
+y_hotspot = 61
 win_name = 'Help'
 
 [cursors.right_ptr]
 png = 'right_ptr.png'
-x_hotspot = 216
-y_hotspot = 24
+x_hotspot = 215
+y_hotspot = 25
 win_name = 'Alternate'
 
 [cursors.sb_h_double_arrow]
 png = 'sb_h_double_arrow.png'
-x_hotspot = 126
-y_hotspot = 119
+x_hotspot = 127
+y_hotspot = 118
 win_name = 'Horz'
 
 [cursors.sb_v_double_arrow]
 png = 'sb_v_double_arrow.png'
-x_hotspot = 121
-y_hotspot = 123
+x_hotspot = 120
+y_hotspot = 122
 win_name = 'Vert'
 
 [cursors.wait]
 png = 'watch-*.png'
-x_hotspot = 127
-y_hotspot = 124
+x_hotspot = 126
+y_hotspot = 126
 win_sizes = "64:96"
 win_name = 'Busy'
 
 [cursors.xterm]
 png = 'xterm.png'
 x_hotspot = 110
-y_hotspot = 125
+y_hotspot = 119
 win_name = 'Text'
 
-[cursors.zoom_in]
+[cursors.zoom-in]
 png = 'zoom-in.png'
-x_hotspot = 110
+x_hotspot = 109
 y_hotspot = 108
 win_name = 'Zoom-in'
 
-[cursors.zoom_out]
+[cursors.zoom-out]
 png = 'zoom-out.png'
-x_hotspot = 110
+x_hotspot = 109
 y_hotspot = 108
 win_name = 'Zoom-out'
 
 [cursors.person]
 png = 'person.png'
 x_hotspot = 36
-y_hotspot = 25
+y_hotspot = 26
 win_name = 'Person'
 
 [cursors.pin]
 png = 'pin.png'
 x_hotspot = 36
-y_hotspot = 25
+y_hotspot = 26
 win_name = 'Pin'
diff --git a/configs/win_xl.build.toml b/configs/win_xl.build.toml
index d743ac3..f34f214 100644
--- a/configs/win_xl.build.toml
+++ b/configs/win_xl.build.toml
@@ -17,126 +17,128 @@ win_delay = 1
 
 [cursors.all-scroll]
 png = 'move.png'
-x_hotspot = 126
-y_hotspot = 114
+x_hotspot = 133
+y_hotspot = 71
 win_name = 'Move'
 
 [cursors.bottom_left_corner]
 png = 'bottom_left_corner.png'
-x_hotspot = 61
-y_hotspot = 189
+x_hotspot = 62
+y_hotspot = 186
 win_name = 'Dng2'
 
 [cursors.bottom_right_corner]
 png = 'bottom_right_corner.png'
-x_hotspot = 192
-y_hotspot = 189
+x_hotspot = 187
+y_hotspot = 188
 win_name = 'Dng1'
 
 [cursors.cross]
 png = 'cross.png'
+x_hotspot = 114
+y_hotspot = 112
 win_name = 'Cross'
 
 [cursors.crossed_circle]
 png = 'crossed_circle.png'
-x_hotspot = 56
-y_hotspot = 17
+x_hotspot = 121
+y_hotspot = 126
 win_name = 'Unavailiable'
 
 [cursors.hand1]
 png = 'hand1.png'
-x_hotspot = 140
-y_hotspot = 58
+x_hotspot = 132
+y_hotspot = 117
 win_name = 'Pan'
 
 [cursors.hand2]
 png = 'hand2.png'
-x_hotspot = 95
-y_hotspot = 56
+x_hotspot = 93
+y_hotspot = 42
 win_name = 'Link'
 
 [cursors.left_ptr]
 png = 'left_ptr.png'
-x_hotspot = 36
-y_hotspot = 26
+x_hotspot = 37
+y_hotspot = 24
 win_name = 'Pointer'
 
 [cursors.left_ptr_watch]
 png = 'left_ptr_watch-*.png'
-x_hotspot = 36
-y_hotspot = 36
+x_hotspot = 35
+y_hotspot = 34
 win_sizes = 64
 win_name = 'Work'
 
 [cursors.grabbing]
 png = 'dnd-none.png'
-x_hotspot = 128
-y_hotspot = 66
+x_hotspot = 135
+y_hotspot = 78
 win_name = 'Grabbing'
 
 [cursors.pencil]
 png = 'pencil.png'
-x_hotspot = 70
-y_hotspot = 213
+x_hotspot = 61
+y_hotspot = 232
 win_name = 'Handwriting'
 
 [cursors.question_arrow]
 png = 'question_arrow.png'
-x_hotspot = 121
-y_hotspot = 172
+x_hotspot = 123
+y_hotspot = 61
 win_name = 'Help'
 
 [cursors.right_ptr]
 png = 'right_ptr.png'
-x_hotspot = 216
-y_hotspot = 24
+x_hotspot = 215
+y_hotspot = 25
 win_name = 'Alternate'
 
 [cursors.sb_h_double_arrow]
 png = 'sb_h_double_arrow.png'
-x_hotspot = 126
-y_hotspot = 119
+x_hotspot = 127
+y_hotspot = 118
 win_name = 'Horz'
 
 [cursors.sb_v_double_arrow]
 png = 'sb_v_double_arrow.png'
-x_hotspot = 121
-y_hotspot = 123
+x_hotspot = 120
+y_hotspot = 122
 win_name = 'Vert'
 
 [cursors.wait]
 png = 'watch-*.png'
-x_hotspot = 127
-y_hotspot = 124
+x_hotspot = 126
+y_hotspot = 126
 win_sizes = 64
 win_name = 'Busy'
 
 [cursors.xterm]
 png = 'xterm.png'
 x_hotspot = 110
-y_hotspot = 125
+y_hotspot = 119
 win_name = 'Text'
 
-[cursors.zoom_in]
+[cursors.zoom-in]
 png = 'zoom-in.png'
-x_hotspot = 110
+x_hotspot = 109
 y_hotspot = 108
 win_name = 'Zoom-in'
 
-[cursors.zoom_out]
+[cursors.zoom-out]
 png = 'zoom-out.png'
-x_hotspot = 110
+x_hotspot = 109
 y_hotspot = 108
 win_name = 'Zoom-out'
 
 [cursors.person]
 png = 'person.png'
 x_hotspot = 36
-y_hotspot = 25
+y_hotspot = 26
 win_name = 'Person'
 
 [cursors.pin]
 png = 'pin.png'
 x_hotspot = 36
-y_hotspot = 25
+y_hotspot = 26
 win_name = 'Pin'
diff --git a/configs/x.build.toml b/configs/x.build.toml
index e45d866..9a117b7 100644
--- a/configs/x.build.toml
+++ b/configs/x.build.toml
@@ -15,61 +15,69 @@ x_hotspot = 128
 y_hotspot = 128
 x11_delay = 20
 
+[cursors.all-scroll]
+png = 'all-scroll.png'
+x_hotspot = 114
+y_hotspot = 114
+x11_name = 'all-scroll'
+
 [cursors.bd_double_arrow]
 png = 'bd_double_arrow.png'
+x_hotspot = 108
+y_hotspot = 107
 x11_name = 'bd_double_arrow'
 x11_symlinks = ["c7088f0f3e6c8088236ef8e1e3e70000", "nwse-resize", "size_fdiag"]
 
 [cursors.bottom_left_corner]
 png = 'bottom_left_corner.png'
-x_hotspot = 61
-y_hotspot = 189
+x_hotspot = 62
+y_hotspot = 186
 x11_name = 'bottom_left_corner'
 x11_symlinks = ["sw-resize"]
 
 [cursors.bottom_right_corner]
 png = 'bottom_right_corner.png'
-x_hotspot = 192
-y_hotspot = 189
+x_hotspot = 187
+y_hotspot = 188
 x11_name = 'bottom_right_corner'
 x11_symlinks = ['se-resize']
 
 [cursors.bottom_side]
 png = 'bottom_side.png'
-x_hotspot = 133
-y_hotspot = 190
+x_hotspot = 131
+y_hotspot = 189
 x11_name = 'bottom_side'
 x11_symlinks = ['s-resize']
 
 [cursors.bottom_tee]
 png = 'bottom_tee.png'
-x_hotspot = 126
-y_hotspot = 189
+x_hotspot = 125
+y_hotspot = 188
 x11_name = 'bottom_tee'
 
 [cursors.center_ptr]
 png = 'center_ptr.png'
 x_hotspot = 124
-y_hotspot = 22
+y_hotspot = 21
 x11_name = 'center_ptr'
 
 [cursors.circle]
 png = 'circle.png'
 x_hotspot = 36
-y_hotspot = 25
+y_hotspot = 26
 x11_name = 'circle'
 x11_symlinks = ['forbidden']
 
 [cursors.context-menu]
 png = 'context-menu.png'
 x_hotspot = 36
-y_hotspot = 25
+y_hotspot = 26
 x11_name = 'context-menu'
 
 [cursors.copy]
 png = 'copy.png'
 x_hotspot = 36
-y_hotspot = 25
+y_hotspot = 26
 x11_name = 'copy'
 x11_symlinks = [
   "1081e37283d90000800003c07f3ef6bf",
@@ -79,11 +87,15 @@ x11_symlinks = [
 
 [cursors.cross]
 png = 'cross.png'
+x_hotspot = 114
+y_hotspot = 112
 x11_name = 'cross'
 x11_symlinks = ["cross_reverse", "diamond_cross"]
 
 [cursors.crossed_circle]
 png = 'crossed_circle.png'
+x_hotspot = 121
+y_hotspot = 126
 x11_name = 'crossed_circle'
 x11_symlinks = ["03b6e0fcb3499374a867c041f52298f0", "not-allowed"]
 
@@ -95,32 +107,34 @@ x11_name = 'crosshair'
 
 [cursors.dnd_no_drop]
 png = 'dnd-no-drop.png'
-x_hotspot = 128
-y_hotspot = 69
+x_hotspot = 133
+y_hotspot = 71
 x11_name = 'dnd_no_drop'
 x11_symlinks = ["no-drop"]
 
 [cursors.dnd-ask]
 png = 'dnd-ask.png'
-x_hotspot = 128
-y_hotspot = 69
+x_hotspot = 133
+y_hotspot = 71
 x11_name = 'dnd-ask'
 
 [cursors.dnd-copy]
 png = 'dnd-copy.png'
-x_hotspot = 128
-y_hotspot = 69
+x_hotspot = 133
+y_hotspot = 71
 x11_name = 'dnd-copy'
 
 [cursors.dnd-link]
 png = 'dnd-link.png'
-x_hotspot = 128
-y_hotspot = 69
+x_hotspot = 133
+y_hotspot = 71
 x11_name = 'dnd-link'
 x11_symlinks = ['alias']
 
 [cursors.dotbox]
 png = 'dotbox.png'
+x_hotspot = 109
+y_hotspot = 109
 x11_name = 'dotbox'
 x11_symlinks = ["dot_box_mask", "draped_box", "icon", "target"]
 
@@ -133,8 +147,8 @@ x11_symlinks = ["fcf1c3c7cd4491d801f1e1c78f100000", "nesw-resize", "size_bdiag"]
 
 [cursors.grabbing]
 png = 'dnd-none.png'
-x_hotspot = 128
-y_hotspot = 66
+x_hotspot = 135
+y_hotspot = 78
 x11_name = 'dnd-none'
 x11_symlinks = [
   "closedhand",
@@ -142,23 +156,23 @@ x11_symlinks = [
   "fcf21c00b30f7e3f83fe0dfd12e71cff"
 ]
 
-[cursors.dnd_move]
+[cursors.dnd-move]
 png = 'dnd-move.png'
-x_hotspot = 128
-y_hotspot = 69
+x_hotspot = 133
+y_hotspot = 71
 x11_name = 'dnd-move'
 
 [cursors.hand1]
 png = 'hand1.png'
-x_hotspot = 140
-y_hotspot = 58
+x_hotspot = 132
+y_hotspot = 117
 x11_name = 'hand1'
 x11_symlinks = ["grab", "openhand"]
 
 [cursors.hand2]
 png = 'hand2.png'
-x_hotspot = 95
-y_hotspot = 56
+x_hotspot = 93
+y_hotspot = 42
 x11_name = 'hand2'
 x11_symlinks = [
   "9d800788f1b08800ae810202380a0822",
@@ -169,15 +183,15 @@ x11_symlinks = [
 
 [cursors.left_ptr]
 png = 'left_ptr.png'
-x_hotspot = 36
-y_hotspot = 26
+x_hotspot = 37
+y_hotspot = 24
 x11_name = 'left_ptr'
 x11_symlinks = ["arrow", "default", "top_left_arrow"]
 
 [cursors.left_ptr_watch]
 png = 'left_ptr_watch-*.png'
-x_hotspot = 36
-y_hotspot = 36
+x_hotspot = 35
+y_hotspot = 34
 x11_name = 'left_ptr_watch'
 x11_symlinks = [
   "00000000000000020006000e7e9ffc3f",
@@ -188,21 +202,21 @@ x11_symlinks = [
 
 [cursors.left_side]
 png = 'left_side.png'
-x_hotspot = 52
-y_hotspot = 130
+x_hotspot = 51
+y_hotspot = 129
 x11_name = 'left_side'
 x11_symlinks = ['w-resize']
 
 [cursors.left_tee]
 png = 'left_tee.png'
 x_hotspot = 74
-y_hotspot = 124
+y_hotspot = 123
 x11_name = 'left_tee'
 
 [cursors.link]
 png = 'link.png'
 x_hotspot = 36
-y_hotspot = 25
+y_hotspot = 24
 x11_name = 'link'
 x11_symlinks = [
   "3085a0e285430894940527032f8b26df",
@@ -212,24 +226,23 @@ x11_symlinks = [
 
 [cursors.ll_angle]
 png = 'll_angle.png'
-x_hotspot = 53
-y_hotspot = 176
+x_hotspot = 51
+y_hotspot = 177
 x11_name = 'll_angle'
 
 [cursors.lr_angle]
 png = 'lr_angle.png'
-x_hotspot = 189
-y_hotspot = 179
+x_hotspot = 188
+y_hotspot = 177
 x11_name = 'lr_angle'
 
 [cursors.move]
 png = 'move.png'
-x_hotspot = 126
-y_hotspot = 114
+x_hotspot = 125
+y_hotspot = 113
 x11_name = 'move'
 x11_symlinks = [
   "4498f0e0c1937ffe01fd06f973665830",
-  "all-scroll",
   "9081237383d90e509aa00f00170e968f",
   "fleur",
   "size_all"
@@ -237,28 +250,28 @@ x11_symlinks = [
 
 [cursors.pencil]
 png = 'pencil.png'
-x_hotspot = 70
-y_hotspot = 213
+x_hotspot = 61
+y_hotspot = 232
 x11_name = 'pencil'
 x11_symlinks = ['draft']
 
 [cursors.plus]
 png = 'plus.png'
 x_hotspot = 104
-y_hotspot = 115
+y_hotspot = 114
 x11_name = 'plus'
 x11_symlinks = ['cell']
 
 [cursors.pointer-move]
 png = 'pointer-move.png'
-x_hotspot = 112
-y_hotspot = 105
+x_hotspot = 36
+y_hotspot = 24
 x11_name = 'pointer-move'
 
 [cursors.question_arrow]
 png = 'question_arrow.png'
-x_hotspot = 121
-y_hotspot = 172
+x_hotspot = 123
+y_hotspot = 61
 x11_name = 'question_arrow'
 x11_symlinks = [
   "5c6cd98b3f3ebcb1f9c7f1c204630408",
@@ -270,14 +283,14 @@ x11_symlinks = [
 
 [cursors.right_ptr]
 png = 'right_ptr.png'
-x_hotspot = 216
-y_hotspot = 24
+x_hotspot = 215
+y_hotspot = 25
 x11_name = 'right_ptr'
 x11_symlinks = ["draft_large", "draft_small"]
 
 [cursors.right_side]
 png = 'right_side.png'
-x_hotspot = 201
+x_hotspot = 202
 y_hotspot = 128
 x11_name = 'right_side'
 x11_symlinks = ['e-resize']
@@ -285,20 +298,20 @@ x11_symlinks = ['e-resize']
 [cursors.right_tee]
 png = 'right_tee.png'
 x_hotspot = 191
-y_hotspot = 224
+y_hotspot = 121
 x11_name = 'right_tee'
 
 [cursors.sb_down_arrow]
 png = 'sb_down_arrow.png'
 x_hotspot = 120
-y_hotspot = 116
+y_hotspot = 99
 x11_name = 'sb_down_arrow'
 x11_symlinks = ['down-arrow']
 
 [cursors.sb_h_double_arrow]
 png = 'sb_h_double_arrow.png'
-x_hotspot = 126
-y_hotspot = 119
+x_hotspot = 127
+y_hotspot = 118
 x11_name = 'sb_h_double_arrow'
 x11_symlinks = [
   "028006030e0e7ebffc7f7070c0600140",
@@ -313,29 +326,29 @@ x11_symlinks = [
 
 [cursors.sb_left_arrow]
 png = 'sb_left_arrow.png'
-x_hotspot = 133
-y_hotspot = 120
+x_hotspot = 152
+y_hotspot = 119
 x11_name = 'sb_left_arrow'
 x11_symlinks = ['left-arrow']
 
 [cursors.sb_right_arrow]
 png = 'sb_right_arrow.png'
-x_hotspot = 116
-y_hotspot = 119
+x_hotspot = 111
+y_hotspot = 117
 x11_name = 'sb_right_arrow'
 x11_symlinks = ['right-arrow']
 
 [cursors.sb_up_arrow]
 png = 'sb_up_arrow.png'
-x_hotspot = 121
-y_hotspot = 106
+x_hotspot = 120
+y_hotspot = 117
 x11_name = 'sb_up_arrow'
 x11_symlinks = ['up-arrow']
 
 [cursors.sb_v_double_arrow]
 png = 'sb_v_double_arrow.png'
-x_hotspot = 121
-y_hotspot = 123
+x_hotspot = 120
+y_hotspot = 122
 x11_name = 'sb_v_double_arrow'
 x11_symlinks = [
   "00008160000006810000408080010102",
@@ -351,29 +364,29 @@ x11_symlinks = [
 
 [cursors.tcross]
 png = 'tcross.png'
-x_hotspot = 121
+x_hotspot = 120
 y_hotspot = 119
 x11_name = 'tcross'
 x11_symlinks = ['color-picker']
 
 [cursors.top_left_corner]
 png = 'top_left_corner.png'
-x_hotspot = 62
+x_hotspot = 61
 y_hotspot = 63
 x11_name = 'top_left_corner'
 x11_symlinks = ['nw-resize']
 
 [cursors.top_right_corner]
 png = 'top_right_corner.png'
-x_hotspot = 190
-y_hotspot = 63
+x_hotspot = 189
+y_hotspot = 64
 x11_name = 'top_right_corner'
 x11_symlinks = ['ne-resize']
 
 [cursors.top_side]
 png = 'top_side.png'
 x_hotspot = 132
-y_hotspot = 50
+y_hotspot = 49
 x11_name = 'top_side'
 x11_symlinks = ['n-resize']
 
@@ -385,8 +398,8 @@ x11_name = 'top_tee'
 
 [cursors.ul_angle]
 png = 'ul_angle.png'
-x_hotspot = 54
-y_hotspot = 63
+x_hotspot = 50
+y_hotspot = 62
 x11_name = 'ul_angle'
 
 [cursors.ur_angle]
@@ -397,14 +410,14 @@ x11_name = 'ur_angle'
 
 [cursors.vertical-text]
 png = 'vertical-text.png'
-x_hotspot = 123
+x_hotspot = 126
 y_hotspot = 107
 x11_name = 'vertical-text'
 
 [cursors.wait]
 png = 'watch-*.png'
-x_hotspot = 127
-y_hotspot = 124
+x_hotspot = 126
+y_hotspot = 126
 x11_name = 'wait'
 x11_symlinks = ['watch']
 
@@ -416,7 +429,7 @@ x11_name = 'wayland-cursor'
 
 [cursors.X_cursor]
 png = 'X_cursor.png'
-x_hotspot = 121
+x_hotspot = 119
 y_hotspot = 119
 x11_name = 'X_cursor'
 x11_symlinks = ["pirate", "x-cursor"]
@@ -424,18 +437,18 @@ x11_symlinks = ["pirate", "x-cursor"]
 [cursors.xterm]
 png = 'xterm.png'
 x_hotspot = 110
-y_hotspot = 125
+y_hotspot = 119
 x11_name = 'xterm'
 x11_symlinks = ["ibeam", "text"]
 
-[cursors.zoom_in]
+[cursors.zoom-in]
 png = 'zoom-in.png'
-x_hotspot = 110
+x_hotspot = 109
 y_hotspot = 108
 x11_name = 'zoom-in'
 
-[cursors.zoom_out]
+[cursors.zoom-out]
 png = 'zoom-out.png'
-x_hotspot = 110
+x_hotspot = 109
 y_hotspot = 108
 x11_name = 'zoom-out'