diff --git a/data/plugins/emote-tab/emote_tab.rb b/data/plugins/emote-tab/emote_tab.rb
index ff3a311a..6bf3bbdc 100644
--- a/data/plugins/emote-tab/emote_tab.rb
+++ b/data/plugins/emote-tab/emote_tab.rb
@@ -2,17 +2,48 @@ require 'java'
 
 java_import 'org.apollo.game.model.Animation'
 
+# Animation constants.
+ANGRY = Animation.new(859)
+BECKON = Animation.new(864)
+BLOW_KISS = Animation.new(1368)
+BOW = Animation.new(858)
+CHEER = Animation.new(862)
+CLAP = Animation.new(865)
+CLIMB_ROPE = Animation.new(1130)
+CRY = Animation.new(860)
+DANCE = Animation.new(866)
+GLASS_BOX = Animation.new(1131)
+GLASS_WALL = Animation.new(1128)
+GOBLIN_BOW = Animation.new(2127)
+GOBLIN_DANCE = Animation.new(2128)
+HEAD_BANG = Animation.new(2108)
+JIG = Animation.new(2106)
+JOY_JUMP = Animation.new(2109)
+LAUGH = Animation.new(861)
+LEAN = Animation.new(1129)
+NO = Animation.new(856)
+PANIC = Animation.new(2105)
+RASPBERRY = Animation.new(2110)
+SALUTE = Animation.new(2112)
+SHRUG = Animation.new(2113)
+SPIN = Animation.new(2107)
+THINKING = Animation.new(857)
+WAVE = Animation.new(863)
+YAWN = Animation.new(2111)
+YES = Animation.new(855)
+
+# A map of buttons to animations.
 ANIMATIONS = {
-  162 => Animation::THINKING, 6_503 => Animation::CLIMB_ROPE, 169 => Animation::NO,
-  164 => Animation::BOW, 13_384 => Animation::GOBLIN_DANCE, 161 => Animation::CRY,
-  170 => Animation::LAUGH, 171 => Animation::CHEER, 163 => Animation::WAVE,
-  167 => Animation::BECKON, 3_362 => Animation::PANIC, 172 => Animation::CLAP,
-  166 => Animation::DANCE, 13_363 => Animation::JIG, 13_364 => Animation::SPIN,
-  13_365 => Animation::HEAD_BANG, 6_506 => Animation::LEAN, 165 => Animation::ANGRY,
-  13_368 => Animation::YAWN, 13_366 => Animation::JOY_JUMP, 667 => Animation::GLASS_BOX,
-  13_367 => Animation::RASPBERRY, 13_369 => Animation::SALUTE, 13_370 => Animation::SHRUG,
-  11_100 => Animation::BLOW_KISS, 666 => Animation::GLASS_WALL, 168 => Animation::YES,
-  13_383 => Animation::GOBLIN_BOW
+  162 => THINKING, 6_503 => CLIMB_ROPE, 169 => NO,
+  164 => BOW, 13_384 => GOBLIN_DANCE, 161 => CRY,
+  170 => LAUGH, 171 => CHEER, 163 => WAVE,
+  167 => BECKON, 3_362 => PANIC, 172 => CLAP,
+  166 => DANCE, 13_363 => JIG, 13_364 => SPIN,
+  13_365 => HEAD_BANG, 6_506 => LEAN, 165 => ANGRY,
+  13_368 => YAWN, 13_366 => JOY_JUMP, 667 => GLASS_BOX,
+  13_367 => RASPBERRY, 13_369 => SALUTE, 13_370 => SHRUG,
+  11_100 => BLOW_KISS, 666 => GLASS_WALL, 168 => YES,
+  13_383 => GOBLIN_BOW
 }
 
 # Intercept the button message.
diff --git a/game/src/main/org/apollo/game/model/Animation.java b/game/src/main/org/apollo/game/model/Animation.java
index a2dab3c8..57df88a9 100644
--- a/game/src/main/org/apollo/game/model/Animation.java
+++ b/game/src/main/org/apollo/game/model/Animation.java
@@ -7,151 +7,11 @@ package org.apollo.game.model;
  */
 public final class Animation {
 
-	/**
-	 * The angry animation.
-	 */
-	public static final Animation ANGRY = new Animation(859);
-
-	/**
-	 * The beckon animation.
-	 */
-	public static final Animation BECKON = new Animation(864);
-
-	/**
-	 * The blow kiss animation.
-	 */
-	public static final Animation BLOW_KISS = new Animation(1368);
-
-	/**
-	 * The bow animation.
-	 */
-	public static final Animation BOW = new Animation(858);
-
-	/**
-	 * The cheer animation.
-	 */
-	public static final Animation CHEER = new Animation(862);
-
-	/**
-	 * The clap animation.
-	 */
-	public static final Animation CLAP = new Animation(865);
-
-	/**
-	 * The climb rope animation.
-	 */
-	public static final Animation CLIMB_ROPE = new Animation(1130);
-
-	/**
-	 * The cry animation.
-	 */
-	public static final Animation CRY = new Animation(860);
-
-	/**
-	 * The dance animation.
-	 */
-	public static final Animation DANCE = new Animation(866);
-
-	/**
-	 * The glass box animation.
-	 */
-	public static final Animation GLASS_BOX = new Animation(1131);
-
-	/**
-	 * The glass wall animation.
-	 */
-	public static final Animation GLASS_WALL = new Animation(1128);
-
-	/**
-	 * The goblin bow animation.
-	 */
-	public static final Animation GOBLIN_BOW = new Animation(2127);
-
-	/**
-	 * The goblin dance animation.
-	 */
-	public static final Animation GOBLIN_DANCE = new Animation(2128);
-
-	/**
-	 * The head bang animation.
-	 */
-	public static final Animation HEAD_BANG = new Animation(2108);
-
-	/**
-	 * The jig animation.
-	 */
-	public static final Animation JIG = new Animation(2106);
-
-	/**
-	 * The joy jump animation.
-	 */
-	public static final Animation JOY_JUMP = new Animation(2109);
-
-	/**
-	 * The laugh animation.
-	 */
-	public static final Animation LAUGH = new Animation(861);
-
-	/**
-	 * The lean animation.
-	 */
-	public static final Animation LEAN = new Animation(1129);
-
-	/**
-	 * The no animation.
-	 */
-	public static final Animation NO = new Animation(856);
-
-	/**
-	 * The panic animation.
-	 */
-	public static final Animation PANIC = new Animation(2105);
-
-	/**
-	 * The raspberry animation.
-	 */
-	public static final Animation RASPBERRY = new Animation(2110);
-
-	/**
-	 * The salute animation.
-	 */
-	public static final Animation SALUTE = new Animation(2112);
-
-	/**
-	 * The shrug animation.
-	 */
-	public static final Animation SHRUG = new Animation(2113);
-
-	/**
-	 * The spin animation.
-	 */
-	public static final Animation SPIN = new Animation(2107);
-
 	/**
 	 * A special animation which stops the current animation.
 	 */
 	public static final Animation STOP_ANIMATION = new Animation(-1);
 
-	/**
-	 * The thinking animation.
-	 */
-	public static final Animation THINKING = new Animation(857);
-
-	/**
-	 * The wave animation.
-	 */
-	public static final Animation WAVE = new Animation(863);
-
-	/**
-	 * The yawn animation.
-	 */
-	public static final Animation YAWN = new Animation(2111);
-
-	/**
-	 * The yes animation.
-	 */
-	public static final Animation YES = new Animation(855);
-
 	/**
 	 * The delay.
 	 */