diff --git a/mappings/net/minecraft/class_4892.mapping b/mappings/net/minecraft/class_4892.mapping
deleted file mode 100644
index a1aec5cde9..0000000000
--- a/mappings/net/minecraft/class_4892.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS net/minecraft/class_4892
-	FIELD field_22738 options Lnet/minecraft/class_315;
diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping
index a9663edcce..b412aaffc0 100644
--- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping
+++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper
-	FIELD field_22734 blitOffset I
+	FIELD field_22734 zOffset I
 	FIELD field_22735 BACKGROUND_LOCATION Lnet/minecraft/class_2960;
 	FIELD field_22736 STATS_ICON_LOCATION Lnet/minecraft/class_2960;
 	FIELD field_22737 GUI_ICONS_LOCATION Lnet/minecraft/class_2960;
@@ -22,7 +22,11 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper
 		ARG 6 height
 		ARG 7 texHeight
 		ARG 8 texWidth
-	METHOD method_25292 hLine (IIII)V
+	METHOD method_25292 drawHorizontalLine (IIII)V
+		ARG 1 x1
+		ARG 2 x2
+		ARG 3 y
+		ARG 4 color
 	METHOD method_25293 blit (IIIIFFIIII)V
 		ARG 0 x
 		ARG 1 y
@@ -88,7 +92,11 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper
 		ARG 3 centerX
 		ARG 4 y
 		ARG 5 color
-	METHOD method_25301 vLine (IIII)V
+	METHOD method_25301 drawVerticalLine (IIII)V
+		ARG 1 x
+		ARG 2 y1
+		ARG 3 y2
+		ARG 4 color
 	METHOD method_25302 blit (IIIIII)V
 		ARG 1 x
 		ARG 2 y
@@ -102,6 +110,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper
 		ARG 3 x
 		ARG 4 y
 		ARG 5 color
-	METHOD method_25304 setBlitOffset (I)V
-		ARG 1 blitOffset
-	METHOD method_25305 getBlitOffset ()I
+	METHOD method_25304 setZOffset (I)V
+		ARG 1 zOffset
+	METHOD method_25305 getZOffset ()I
diff --git a/mappings/net/minecraft/client/gui/GameInfoChatListener.mapping b/mappings/net/minecraft/client/gui/GameInfoChatListener.mapping
index e44ad0f203..5440a4c7fa 100644
--- a/mappings/net/minecraft/client/gui/GameInfoChatListener.mapping
+++ b/mappings/net/minecraft/client/gui/GameInfoChatListener.mapping
@@ -1,2 +1,4 @@
 CLASS net/minecraft/class_336 net/minecraft/client/gui/GameInfoChatListener
 	FIELD field_2057 client Lnet/minecraft/class_310;
+	METHOD <init> (Lnet/minecraft/class_310;)V
+		ARG 1 client
diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping
index 5e5824dd8f..b4d56c1eb7 100644
--- a/mappings/net/minecraft/client/gui/screen/Screen.mapping
+++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping
@@ -4,13 +4,13 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 	FIELD field_22784 clickedLink Ljava/net/URI;
 	FIELD field_22785 title Lnet/minecraft/class_2561;
 	FIELD field_22786 children Ljava/util/List;
-	FIELD field_22787 minecraft Lnet/minecraft/class_310;
+	FIELD field_22787 client Lnet/minecraft/class_310;
 	FIELD field_22788 itemRenderer Lnet/minecraft/class_918;
 	FIELD field_22789 width I
 	FIELD field_22790 height I
 	FIELD field_22791 buttons Ljava/util/List;
 	FIELD field_22792 passEvents Z
-	FIELD field_22793 font Lnet/minecraft/class_327;
+	FIELD field_22793 textRenderer Lnet/minecraft/class_327;
 	METHOD <init> (Lnet/minecraft/class_2561;)V
 		ARG 1 title
 	METHOD method_25408 getTooltipFromItem (Lnet/minecraft/class_1799;)Ljava/util/List;
@@ -42,8 +42,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 		ARG 1 text
 		ARG 2 x
 		ARG 3 y
-	METHOD method_25418 renderComponentHoverEffect (Lnet/minecraft/class_2561;II)V
-		ARG 1 component
+	METHOD method_25418 renderTextHoverEffect (Lnet/minecraft/class_2561;II)V
+		ARG 1 text
 		ARG 2 x
 		ARG 3 y
 	METHOD method_25419 onClose ()V
@@ -67,7 +67,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 	METHOD method_25428 confirmLink (Z)V
 		ARG 1 open
 	METHOD method_25429 addChild (Lnet/minecraft/class_364;)Lnet/minecraft/class_364;
-	METHOD method_25430 handleComponentClicked (Lnet/minecraft/class_2561;)Z
+	METHOD method_25430 handleTextClick (Lnet/minecraft/class_2561;)Z
+		ARG 1 text
 	METHOD method_25431 tick ()V
 	METHOD method_25432 removed ()V
 	METHOD method_25433 renderBackground (I)V
diff --git a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping
index 3c661cd1be..fedd0b3c52 100644
--- a/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping
+++ b/mappings/net/minecraft/client/gui/widget/AbstractButtonWidget.mapping
@@ -7,7 +7,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidg
 	FIELD field_22759 height I
 	FIELD field_22760 x I
 	FIELD field_22761 y I
-	FIELD field_22762 isHovered Z
+	FIELD field_22762 hovered Z
 	FIELD field_22763 active Z
 	FIELD field_22764 visible Z
 	FIELD field_22765 alpha F
@@ -29,6 +29,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidg
 	METHOD method_25350 setAlpha (F)V
 		ARG 1 value
 	METHOD method_25351 isValidClickButton (I)Z
+		ARG 1 button
 	METHOD method_25352 renderToolTip (II)V
 		ARG 1 mouseX
 		ARG 2 mouseY
@@ -56,6 +57,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/AbstractButtonWidg
 		ARG 1 mouseX
 		ARG 3 mouseY
 	METHOD method_25362 queueNarration (I)V
+		ARG 1 delay
 	METHOD method_25363 onFocusedChanged (Z)V
 	METHOD method_25364 getHeight ()I
 	METHOD method_25365 setFocused (Z)V
diff --git a/mappings/net/minecraft/client/gui/widget/GameOptionSliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping
similarity index 70%
rename from mappings/net/minecraft/client/gui/widget/GameOptionSliderWidget.mapping
rename to mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping
index ab9b0f5c0f..561de89cb4 100644
--- a/mappings/net/minecraft/client/gui/widget/GameOptionSliderWidget.mapping
+++ b/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4040 net/minecraft/client/gui/widget/GameOptionSliderWidget
+CLASS net/minecraft/class_4040 net/minecraft/client/gui/widget/DoubleOptionSliderWidget
 	FIELD field_18012 option Lnet/minecraft/class_4067;
 	METHOD <init> (Lnet/minecraft/class_315;IIIILnet/minecraft/class_4067;)V
 		ARG 1 gameOptions
diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping
index 094a4dc272..02be348e76 100644
--- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping
+++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 	FIELD field_19087 right I
 	FIELD field_19088 left I
 	FIELD field_22739 children Ljava/util/List;
-	FIELD field_22740 minecraft Lnet/minecraft/class_310;
+	FIELD field_22740 client Lnet/minecraft/class_310;
 	FIELD field_22741 itemHeight I
 	FIELD field_22742 width I
 	FIELD field_22743 height I
@@ -53,7 +53,11 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 	METHOD method_25316 isFocused ()Z
 	METHOD method_25317 getMaxPosition ()I
 	METHOD method_25318 updateScrollingState (DDI)V
+		ARG 1 mouseX
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD method_25319 getRowBottom (I)I
+		ARG 1 index
 	METHOD method_25320 renderDecorations (II)V
 		ARG 1 mouseX
 		ARG 2 mouseY
@@ -77,7 +81,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 		ARG 4 alphaBottom
 	METHOD method_25328 ensureVisible (Lnet/minecraft/class_350$class_351;)V
 		ARG 1 entry
-	METHOD method_25329 getScrollbarPosition ()I
+	METHOD method_25329 getScrollbarPositionX ()I
 	METHOD method_25330 removeEntry (Lnet/minecraft/class_350$class_351;)Z
 		ARG 1 entry
 	METHOD method_25331 getMaxScroll ()I
diff --git a/mappings/net/minecraft/client/gui/widget/ListWidget.mapping b/mappings/net/minecraft/client/gui/widget/ListWidget.mapping
index 877e27243c..e7a417cfb6 100644
--- a/mappings/net/minecraft/client/gui/widget/ListWidget.mapping
+++ b/mappings/net/minecraft/client/gui/widget/ListWidget.mapping
@@ -1,11 +1,11 @@
 CLASS net/minecraft/class_358 net/minecraft/client/gui/widget/ListWidget
 	FIELD field_2165 bottom I
 	FIELD field_2166 top I
-	FIELD field_2175 scroll D
+	FIELD field_2175 scrollAmount D
 	FIELD field_2180 left I
 	FIELD field_2181 right I
 	FIELD field_22769 scrolling Z
-	FIELD field_22770 minecraft Lnet/minecraft/class_310;
+	FIELD field_22770 client Lnet/minecraft/class_310;
 	FIELD field_22771 width I
 	FIELD field_22772 height I
 	FIELD field_22773 itemHeight I
@@ -24,6 +24,8 @@ CLASS net/minecraft/class_358 net/minecraft/client/gui/widget/ListWidget
 		ARG 6 itemHeight
 	METHOD method_25371 getItemCount ()I
 	METHOD method_25372 getItemAtPosition (DD)I
+		ARG 1 mouseX
+		ARG 3 mouseY
 	METHOD method_25373 isSelectedItem (I)Z
 		ARG 1 index
 	METHOD method_25374 clickedHeader (II)V
@@ -34,25 +36,47 @@ CLASS net/minecraft/class_358 net/minecraft/client/gui/widget/ListWidget
 		ARG 5 mouseY
 	METHOD method_25376 updateItemPosition (IIIF)V
 		ARG 1 index
+		ARG 2 x
+		ARG 3 y
+		ARG 4 delta
 	METHOD method_25377 renderList (IIIIF)V
 		ARG 1 x
 		ARG 2 y
 		ARG 3 mouseX
 		ARG 4 mouseY
+		ARG 5 delta
 	METHOD method_25378 renderItem (IIIIIIF)V
 		ARG 1 index
-		ARG 2 y
+		ARG 2 x
+		ARG 3 y
+		ARG 4 itemHeight
+		ARG 5 mouseX
+		ARG 6 mouseY
+		ARG 7 delta
 	METHOD method_25379 renderHeader (IILnet/minecraft/class_289;)V
+		ARG 1 x
+		ARG 2 y
+		ARG 3 tessellator
 	METHOD method_25380 renderBackground ()V
 	METHOD method_25381 updateScrollingState (DDI)V
+		ARG 1 mouseX
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD method_25382 renderDecorations (II)V
+		ARG 1 mouseX
+		ARG 2 mouseY
 	METHOD method_25383 isVisible ()Z
 	METHOD method_25384 isMouseInList (DD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
 	METHOD method_25385 getMaxPosition ()I
 	METHOD method_25386 moveSelection (I)V
+		ARG 1 by
 	METHOD method_25387 renderHoleBackground (IIII)V
+		ARG 1 top
+		ARG 2 bottom
+		ARG 3 topAlpha
+		ARG 4 bottomAlpha
 	METHOD method_25388 capYPosition ()V
 	METHOD method_25389 getMaxScroll ()I
 	METHOD method_25390 getRowWidth ()I
diff --git a/mappings/net/minecraft/client/gui/widget/OptionSliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/OptionSliderWidget.mapping
new file mode 100644
index 0000000000..ea123c704a
--- /dev/null
+++ b/mappings/net/minecraft/client/gui/widget/OptionSliderWidget.mapping
@@ -0,0 +1,9 @@
+CLASS net/minecraft/class_4892 net/minecraft/client/gui/widget/OptionSliderWidget
+	FIELD field_22738 options Lnet/minecraft/class_315;
+	METHOD <init> (Lnet/minecraft/class_315;IIIID)V
+		ARG 1 options
+		ARG 2 x
+		ARG 3 y
+		ARG 4 width
+		ARG 5 height
+		ARG 6 value
diff --git a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping
index a284c9cc00..04c046d673 100644
--- a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping
+++ b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping
@@ -1,9 +1,15 @@
 CLASS net/minecraft/class_357 net/minecraft/client/gui/widget/SliderWidget
 	FIELD field_22753 value D
 	METHOD <init> (IIIILjava/lang/String;D)V
+		ARG 1 x
+		ARG 2 y
+		ARG 3 width
+		ARG 4 height
+		ARG 5 message
 		ARG 6 value
 	METHOD method_25344 applyValue ()V
 	METHOD method_25345 setValueFromMouse (D)V
+		ARG 1 mouseX
 	METHOD method_25346 updateMessage ()V
 	METHOD method_25347 setValue (D)V
 		ARG 1 mouseX