diff --git a/data/xmmt.dituon.petpet/bite/data.json b/data/xmmt.dituon.petpet/bite/data.json
index 5f0fb71d..7e9d260d 100644
--- a/data/xmmt.dituon.petpet/bite/data.json
+++ b/data/xmmt.dituon.petpet/bite/data.json
@@ -1,14 +1,17 @@
 {
   "type": "GIF",
-  "avatar": "SINGLE",
-  "pos": [
-      [90, 90, 105, 150], [90, 83, 96, 172], [90, 90, 106, 148],
-      [88, 88, 97, 167], [90, 85, 89, 179], [90, 90, 106, 151],
-      [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0],
-      [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]
+  "avatar": [
+    {
+      "type": "TO",
+      "pos": [
+        [90, 90, 105, 150], [90, 83, 96, 172], [90, 90, 106, 148],
+        [88, 88, 97, 167], [90, 85, 89, 179], [90, 90, 106, 151],
+        [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0],
+        [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]
+    ],
+    "round": true,
+    "avatarOnTop": false
+    }
   ],
-  "text": [],
-  "round": true,
-  "rotate": false,
-  "avatarOnTop": false
-}
+  "text": []
+}
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/hammer/data.json b/data/xmmt.dituon.petpet/hammer/data.json
index 26280a19..ed0c12f4 100644
--- a/data/xmmt.dituon.petpet/hammer/data.json
+++ b/data/xmmt.dituon.petpet/hammer/data.json
@@ -1,12 +1,15 @@
 {
   "type": "GIF",
-  "avatar": "SINGLE",
-  "pos": [
-    [62, 143, 158, 113], [52, 177, 173, 105], [42, 192, 192, 92], [46, 182, 184, 100],
-    [54, 169, 174, 110], [69, 128, 144, 135], [65, 130, 152, 124]
+  "avatar": [
+    {
+      "type": "TO",
+      "pos": [
+        [62, 143, 158, 113], [52, 177, 173, 105], [42, 192, 192, 92], [46, 182, 184, 100],
+        [54, 169, 174, 110], [69, 128, 144, 135], [65, 130, 152, 124]
+      ],
+      "round": true,
+      "avatarOnTop": false
+    }
   ],
-  "text": [],
-  "round": true,
-  "rotate": false,
-  "avatarOnTop": false
-}
+  "text": []
+}
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/kiss/data.json b/data/xmmt.dituon.petpet/kiss/data.json
index d904a14a..941b7ce1 100644
--- a/data/xmmt.dituon.petpet/kiss/data.json
+++ b/data/xmmt.dituon.petpet/kiss/data.json
@@ -1,18 +1,22 @@
 {
   "type": "GIF",
-  "avatar": "DOUBLE",
-  "pos": [
-    [ [92, 64, 40, 40], [135, 40, 40, 40], [84, 105, 40, 40], [80, 110, 40, 40],
-      [155, 82, 40, 40], [60, 96, 40, 40], [50, 80, 40, 40], [98, 55, 40, 40],
-      [35, 65, 40, 40], [38, 100, 40, 40], [70, 80, 40, 40], [84, 65, 40, 40],
-      [75, 65, 40, 40]],
-    [[58, 90, 50, 50], [62, 95, 50, 50], [42, 100, 50, 50], [50, 100, 50, 50],
-      [56, 100, 50, 50], [18, 120, 50, 50], [28, 110, 50, 50], [54, 100, 50, 50],
-      [46, 100, 50, 50], [60, 100, 50, 50], [35, 115, 50, 50], [20, 120, 50, 50],
-      [40, 96, 50, 50]]
+  "avatar": [
+    {
+      "type": "FROM",
+      "pos": [[92, 64, 40, 40], [135, 40, 40, 40], [84, 105, 40, 40], [80, 110, 40, 40],
+        [155, 82, 40, 40], [60, 96, 40, 40], [50, 80, 40, 40], [98, 55, 40, 40],
+        [35, 65, 40, 40], [38, 100, 40, 40], [70, 80, 40, 40], [84, 65, 40, 40],
+        [75, 65, 40, 40]],
+      "round": true
+    },
+    {
+      "type": "TO",
+      "pos": [[58, 90, 50, 50], [62, 95, 50, 50], [42, 100, 50, 50], [50, 100, 50, 50],
+        [56, 100, 50, 50], [18, 120, 50, 50], [28, 110, 50, 50], [54, 100, 50, 50],
+        [46, 100, 50, 50], [60, 100, 50, 50], [35, 115, 50, 50], [20, 120, 50, 50],
+        [40, 96, 50, 50]],
+      "round": true
+    }
   ],
-  "text": [],
-  "round": true,
-  "rotate": false,
-  "avatarOnTop": true
+  "text": []
 }
diff --git a/data/xmmt.dituon.petpet/knock/data.json b/data/xmmt.dituon.petpet/knock/data.json
index 9add37d6..c9edfa89 100644
--- a/data/xmmt.dituon.petpet/knock/data.json
+++ b/data/xmmt.dituon.petpet/knock/data.json
@@ -1,12 +1,14 @@
 {
   "type": "GIF",
-  "avatar": "SINGLE",
-  "pos": [
-    [60, 308, 210, 195], [60, 308, 210, 198], [45, 330, 250, 172], [58, 320, 218, 180],
-    [60, 310, 215, 175], [40, 320, 250, 285], [48, 308, 226, 192], [51, 301, 223, 200]
+  "avatar": [
+    {
+      "type": "TO",
+      "pos": [
+        [60, 308, 210, 195], [60, 308, 210, 198], [45, 330, 250, 172], [58, 320, 218, 180],
+        [60, 310, 215, 175], [40, 320, 250, 285], [48, 308, 226, 192], [51, 301, 223, 200]
+      ],
+      "avatarOnTop": false
+    }
   ],
-  "text": [],
-  "round": false,
-  "rotate": false,
-  "avatarOnTop": false
+  "text": []
 }
diff --git a/data/xmmt.dituon.petpet/nanomachine-son/data.json b/data/xmmt.dituon.petpet/nanomachine-son/data.json
index 903e9f46..a5ee2a68 100644
--- a/data/xmmt.dituon.petpet/nanomachine-son/data.json
+++ b/data/xmmt.dituon.petpet/nanomachine-son/data.json
@@ -1,18 +1,22 @@
 {
 
   "type": "GIF",
-  "avatar": "DOUBLE",
-  "pos": [
-   [
-     [90, 60, 70, 70],[88, 58, 70, 70],[80, 56, 70, 70],[70, 65, 70, 70],
-     [90, 98, 70, 70],[70, 102, 70, 70],[65, 120, 70, 70],[85, 85, 70, 70]
-   ],[
-      [260, 5, 70, 70],[257, 0, 70, 70],[250, -10, 70, 70],[257, 0, 70, 70],
-      [260, 5, 70, 70],[257, 0, 70, 70],[260, 10, 70, 70],[270, 10, 70, 70]
-    ]
+  "avatar": [
+    {
+      "type": "FROM",
+      "pos": [
+        [90, 60, 70, 70],[88, 58, 70, 70],[80, 56, 70, 70],[70, 65, 70, 70],
+        [90, 98, 70, 70],[70, 102, 70, 70],[65, 120, 70, 70],[85, 85, 70, 70]
+        ],
+      "round": true
+    },{
+      "type": "TO",
+      "pos": [
+        [260, 5, 70, 70],[257, 0, 70, 70],[250, -10, 70, 70],[257, 0, 70, 70],
+        [260, 5, 70, 70],[257, 0, 70, 70],[260, 10, 70, 70],[270, 10, 70, 70]
+        ],
+      "round": true
+    }
   ],
-  "text": [],
-  "round": true,
-  "rotate": false,
-  "avatarOnTop": true
+  "text": []
 }
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/osu/data.json b/data/xmmt.dituon.petpet/osu/data.json
index 05961045..4ee84bf8 100644
--- a/data/xmmt.dituon.petpet/osu/data.json
+++ b/data/xmmt.dituon.petpet/osu/data.json
@@ -1,7 +1,6 @@
 {
     "type": "IMG",
-    "avatar": "NONE",
-    "pos": [],
+    "avatar": [],
     "text": [
         {
             "text": "$txt1[osu!]",
@@ -10,8 +9,5 @@
             "size": 114,
             "font": "Aller"
         }
-    ],
-    "round": false,
-    "rotate": false,
-    "avatarOnTop": false
+    ]
 }
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/petpet/data.json b/data/xmmt.dituon.petpet/petpet/data.json
index 813bda42..9cffa5d5 100644
--- a/data/xmmt.dituon.petpet/petpet/data.json
+++ b/data/xmmt.dituon.petpet/petpet/data.json
@@ -1,12 +1,14 @@
 {
-
   "type": "GIF",
-  "avatar": "SINGLE",
-  "pos": [
-    [14, 20, 98, 98], [12, 33, 101, 85], [8, 40, 110, 76], [10, 33, 102, 84], [12, 20, 98, 98]
+  "avatar": [
+    {
+      "type": "TO",
+      "pos": [
+        [14, 20, 98, 98], [12, 33, 101, 85], [8, 40, 110, 76], [10, 33, 102, 84], [12, 20, 98, 98]
+      ],
+      "round": true,
+      "avatarOnTop": false
+    }
   ],
-  "text": [],
-  "round": true,
-  "rotate": false,
-  "avatarOnTop": false
+  "text": []
 }
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/play/data.json b/data/xmmt.dituon.petpet/play/data.json
index 8fbd7adf..08c70392 100644
--- a/data/xmmt.dituon.petpet/play/data.json
+++ b/data/xmmt.dituon.petpet/play/data.json
@@ -1,18 +1,19 @@
 {
-
   "type": "GIF",
-  "avatar": "SINGLE",
-  "pos": [
-    [180, 60, 100, 100], [184, 75, 100, 100], [183, 98, 100, 100],
-    [179, 118, 110, 100], [156, 194, 150, 48], [178, 136, 122, 69],
-    [175, 66, 122, 85], [170, 42, 130, 96], [175, 34, 118, 95],
-    [179, 35, 110, 93], [180, 54, 102, 93], [183, 58, 97, 92],
-    [174, 35, 120, 94], [179, 35, 109, 93], [181, 54, 101, 92],
-    [182, 59, 98, 92], [183, 71, 90, 96], [180, 131, 92, 101],
-    [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]
+  "avatar": [
+    {
+      "type": "TO",
+      "pos": [
+        [180, 60, 100, 100], [184, 75, 100, 100], [183, 98, 100, 100],
+        [179, 118, 110, 100], [156, 194, 150, 48], [178, 136, 122, 69],
+        [175, 66, 122, 85], [170, 42, 130, 96], [175, 34, 118, 95],
+        [179, 35, 110, 93], [180, 54, 102, 93], [183, 58, 97, 92],
+        [174, 35, 120, 94], [179, 35, 109, 93], [181, 54, 101, 92],
+        [182, 59, 98, 92], [183, 71, 90, 96], [180, 131, 92, 101],
+        [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]
+      ],
+      "avatarOnTop": false
+    }
   ],
-  "text": [],
-  "round": false,
-  "rotate": false,
-  "avatarOnTop": false
+  "text": []
 }
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/pound/data.json b/data/xmmt.dituon.petpet/pound/data.json
index 2ac5eda3..faf1b1ec 100644
--- a/data/xmmt.dituon.petpet/pound/data.json
+++ b/data/xmmt.dituon.petpet/pound/data.json
@@ -1,13 +1,14 @@
 {
-
   "type": "GIF",
-  "avatar": "SINGLE",
-  "pos": [
-    [135, 240, 138, 47], [135, 240, 138, 47], [150, 190, 105, 95], [150, 190, 105, 95],
-    [148, 188, 106, 98], [146, 196, 110, 88], [145, 223, 112, 61], [145, 223, 112, 61]
+  "avatar": [
+    {
+      "type": "TO",
+      "pos": [
+        [135, 240, 138, 47], [135, 240, 138, 47], [150, 190, 105, 95], [150, 190, 105, 95],
+        [148, 188, 106, 98], [146, 196, 110, 88], [145, 223, 112, 61], [145, 223, 112, 61]
+      ],
+      "avatarOnTop": false
+    }
   ],
-  "text": [],
-  "round": false,
-  "rotate": false,
-  "avatarOnTop": false
+  "text": []
 }
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/roll/data.json b/data/xmmt.dituon.petpet/roll/data.json
index db2c93a5..c9e367eb 100644
--- a/data/xmmt.dituon.petpet/roll/data.json
+++ b/data/xmmt.dituon.petpet/roll/data.json
@@ -1,13 +1,16 @@
 {
-
   "type": "GIF",
-  "avatar": "SINGLE",
-  "pos": [
-    [87, 77, 220, 220], [96, 85, 220, 220], [92, 79, 220, 220], [92, 78, 220, 220],
-    [92, 75, 220, 220], [92, 75, 220, 220], [93, 76, 220, 220], [90, 80, 220, 220]
+  "avatar": [
+    {
+      "type": "TO",
+      "pos": [
+        [87, 77, 220, 220], [96, 85, 220, 220], [92, 79, 220, 220], [92, 78, 220, 220],
+        [92, 75, 220, 220], [92, 75, 220, 220], [93, 76, 220, 220], [90, 80, 220, 220]
+      ],
+      "round": true,
+      "rotate": true,
+      "avatarOnTop": false
+    }
   ],
-  "text": [],
-  "round": true,
-  "rotate": true,
-  "avatarOnTop": false
+  "text": []
 }
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/rub/data.json b/data/xmmt.dituon.petpet/rub/data.json
index 2f6639b3..31a7de01 100644
--- a/data/xmmt.dituon.petpet/rub/data.json
+++ b/data/xmmt.dituon.petpet/rub/data.json
@@ -1,15 +1,17 @@
 {
-
   "type": "GIF",
-  "avatar": "DOUBLE",
-  "pos": [
-    [[102, 95, 70, 80], [108, 60, 50, 100], [97, 18, 65, 95],
+  "avatar": [
+    {
+      "type": "FROM",
+      "pos": [[102, 95, 70, 80], [108, 60, 50, 100], [97, 18, 65, 95],
       [65, 5, 75, 75], [95, 57, 100, 55], [109, 107, 65, 75]],
-    [[39, 91, 75, 75], [49, 101, 75, 75], [67, 98, 75, 75],
-      [55, 86, 75, 75], [61, 109, 75, 75], [65, 101, 75, 75]]
+      "round": true
+    },{
+      "type": "TO",
+      "pos": [[39, 91, 75, 75], [49, 101, 75, 75], [67, 98, 75, 75],
+      [55, 86, 75, 75], [61, 109, 75, 75], [65, 101, 75, 75]],
+      "round": true
+    }
   ],
-  "text": [],
-  "round": true,
-  "rotate": false,
-  "avatarOnTop": true
+  "text": []
 }
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/suck/data.json b/data/xmmt.dituon.petpet/suck/data.json
index 7e082f7b..61b1d1f1 100644
--- a/data/xmmt.dituon.petpet/suck/data.json
+++ b/data/xmmt.dituon.petpet/suck/data.json
@@ -1,14 +1,16 @@
 {
 
   "type": "GIF",
-  "avatar": "SINGLE",
-  "pos": [
-    [82, 100, 130, 119], [82, 94, 126, 125], [82, 120, 128, 99], [81, 164, 132, 55],
-    [79, 163, 132, 55], [82, 140, 127, 79], [83, 152, 125, 67], [75, 157, 140, 62],
-    [72, 165, 144, 54], [80, 132, 128, 87], [81, 127, 127, 92], [79, 111, 132, 108]
+  "avatar": [
+    {
+      "type": "TO",
+      "pos": [
+        [82, 100, 130, 119], [82, 94, 126, 125], [82, 120, 128, 99], [81, 164, 132, 55],
+        [79, 163, 132, 55], [82, 140, 127, 79], [83, 152, 125, 67], [75, 157, 140, 62],
+        [72, 165, 144, 54], [80, 132, 128, 87], [81, 127, 127, 92], [79, 111, 132, 108]
+      ],
+      "avatarOnTop": false
+    }
   ],
-  "text": [],
-  "round": false,
-  "rotate": false,
-  "avatarOnTop": false
+  "text": []
 }
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/throw/data.json b/data/xmmt.dituon.petpet/throw/data.json
index 7590c755..e3315d51 100644
--- a/data/xmmt.dituon.petpet/throw/data.json
+++ b/data/xmmt.dituon.petpet/throw/data.json
@@ -1,15 +1,18 @@
 {
 
   "type": "GIF",
-  "avatar": "DOUBLE",
-  "pos": [
-    [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0],
+  "avatar": [
+    {
+      "type": "FROM",
+      "pos": [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0],
       [289, 70, 33, 33], [280, 73, 32, 32], [259, 31, 35, 35], [-50, 220, 175, 175]],
-    [[108, 36, 32, 32], [122, 36, 32, 32], [0, 0, 0, 0], [19, 129, 123, 123],
-      [-50, 200, 185, 185], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]
+      "round": true
+    },{
+      "type": "TO",
+      "pos": [[108, 36, 32, 32], [122, 36, 32, 32], [0, 0, 0, 0], [19, 129, 123, 123],
+      [-50, 200, 185, 185]],
+      "round": true
+    }
   ],
-  "text": [],
-  "round": true,
-  "rotate": false,
-  "avatarOnTop": true
+  "text": []
 }
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/thump/data.json b/data/xmmt.dituon.petpet/thump/data.json
index c465ddf1..148dbac9 100644
--- a/data/xmmt.dituon.petpet/thump/data.json
+++ b/data/xmmt.dituon.petpet/thump/data.json
@@ -1,11 +1,12 @@
 {
   "type": "GIF",
-  "avatar": "SINGLE",
-  "pos": [
-    [65, 128, 77, 72], [67, 128, 73, 72], [54, 139, 94, 61], [57, 135, 86, 65]
+  "avatar": [
+    {
+      "type": "TO",
+      "pos": [[65, 128, 77, 72], [67, 128, 73, 72], [54, 139, 94, 61], [57, 135, 86, 65]],
+      "round": true,
+      "avatarOnTop": false
+    }
   ],
-  "text": [],
-  "round": true,
-  "rotate": false,
-  "avatarOnTop": false
+  "text": []
 }
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/tightly/data.json b/data/xmmt.dituon.petpet/tightly/data.json
index 9da46173..332687d4 100644
--- a/data/xmmt.dituon.petpet/tightly/data.json
+++ b/data/xmmt.dituon.petpet/tightly/data.json
@@ -1,14 +1,16 @@
 {
   "type": "GIF",
-  "avatar": "SINGLE",
-  "pos": [
-    [39, 169, 267, 141], [40, 167, 264, 143], [38, 174, 270, 135], [40, 167, 264, 143], [38, 174, 270, 135],
-    [40, 167, 264, 143], [38, 174, 270, 135], [40, 167, 264, 143], [38, 174, 270, 135], [28, 176, 293, 134],
-    [5, 215, 333, 96], [10, 210, 321, 102], [3, 210, 330, 104], [4, 210, 328, 102], [4, 212, 328, 100],
-    [4, 212, 328, 100], [4, 212, 328, 100], [4, 212, 328, 100], [4, 212, 328, 100], [29, 195, 285, 120]
+  "avatar": [
+    {
+      "type": "TO",
+      "pos": [
+        [39, 169, 267, 141], [40, 167, 264, 143], [38, 174, 270, 135], [40, 167, 264, 143], [38, 174, 270, 135],
+        [40, 167, 264, 143], [38, 174, 270, 135], [40, 167, 264, 143], [38, 174, 270, 135], [28, 176, 293, 134],
+        [5, 215, 333, 96], [10, 210, 321, 102], [3, 210, 330, 104], [4, 210, 328, 102], [4, 212, 328, 100],
+        [4, 212, 328, 100], [4, 212, 328, 100], [4, 212, 328, 100], [4, 212, 328, 100], [29, 195, 285, 120]
+      ],
+      "avatarOnTop": false
+    }
   ],
-  "text": [],
-  "round": false,
-  "rotate": false,
-  "avatarOnTop": false
+  "text": []
 }
\ No newline at end of file
diff --git a/data/xmmt.dituon.petpet/twist/data.json b/data/xmmt.dituon.petpet/twist/data.json
index 651b8079..012e5886 100644
--- a/data/xmmt.dituon.petpet/twist/data.json
+++ b/data/xmmt.dituon.petpet/twist/data.json
@@ -1,12 +1,16 @@
 {
   "type": "GIF",
-  "avatar": "SINGLE",
-  "pos": [
-    [25, 66, 80, 80], [25, 66, 80, 80], [23, 68, 80, 80],
-    [20, 69, 80, 80], [22, 68, 80, 80]
+  "avatar": [
+    {
+      "type": "TO",
+      "pos": [
+        [25, 66, 80, 80], [25, 66, 80, 80], [23, 68, 80, 80],
+        [20, 69, 80, 80], [22, 68, 80, 80]
+      ],
+      "round": true,
+      "rotate": true,
+      "avatarOnTop": false
+    }
   ],
-  "text": [],
-  "round": true,
-  "rotate": true,
-  "avatarOnTop": false
+  "text": []
 }
\ No newline at end of file
diff --git a/src/main/java/xmmt/dituon/share/AvatarModel.java b/src/main/java/xmmt/dituon/share/AvatarModel.java
index 924ec0ac..11d0480c 100644
--- a/src/main/java/xmmt/dituon/share/AvatarModel.java
+++ b/src/main/java/xmmt/dituon/share/AvatarModel.java
@@ -99,7 +99,7 @@ public boolean isOnTop() {
 
     public BufferedImage getImage() {
         assert image != null;
-        if (rotate) {
+        if (round) {
             try {
                 return ImageSynthesis.convertCircular(image, antialias);
             } catch (IOException e) {