diff --git a/card/standard.js b/card/standard.js
index 8a408ba0f..79e98d1e6 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -693,9 +693,16 @@ card.standard={
 				return (target.num('hej')>0);
 			},
 			content:function(){
+				"step 0"
 				if(target.num('hej')){
-					player.gainPlayerCard('hej',target,true);
+					player.choosePlayerCard(target,true);
 				}
+				else{
+					event.finish();
+				}
+				"step 1"
+				player.gain(result.buttons[0].link);
+				target.$give(1,player);
 			},
 			ai:{
 				wuxie:function(target,card,player,viewer){
@@ -741,9 +748,15 @@ card.standard={
 				return (target.num('hej')>0);
 			},
 			content:function(){
+				"step 0"
 				if(target.num('hej')){
-					player.discardPlayerCard('hej',target,true);
+					player.choosePlayerCard(target,true);
 				}
+				else{
+					event.finish();
+				}
+				"step 1"
+				target.discard(result.buttons[0].link);
 			},
 			ai:{
 				basic:{
diff --git a/character/standard.js b/character/standard.js
index 678eeca73..cd7788c5d 100644
--- a/character/standard.js
+++ b/character/standard.js
@@ -611,8 +611,8 @@ character.standard={
 			frequent:true,
 			content:function(){
 				"step 0"
-				if(player.isUnderControl()){
-					game.modeSwapPlayer(player);
+				if(player.underControl()){
+					game.swapPlayer(player);
 				}
 				if(event.isMine()){
 					ui.auto.hide();
diff --git a/image/card/hufu.png b/image/card/hufu.png
index c7d370158..d534ac9fd 100644
Binary files a/image/card/hufu.png and b/image/card/hufu.png differ
diff --git a/mode/versus.js b/mode/versus.js
index c5571c05e..09cf3b6c9 100644
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -584,7 +584,7 @@ mode.versus={
 				e.stopPropagation();
 			}
 			else{
-				game.modeSwapPlayer(this.link);
+				game.versusSwapControl(this.link);
 			}
 		},
 		versusCheckHandcards:function(){
@@ -838,7 +838,7 @@ mode.versus={
 				}
 			}
 		},
-		modeSwapPlayer:function(player){
+		versusSwapControl:function(player){
 			if(lib.storage.control_all){
 				game.swapControl(player);
 			}
@@ -928,20 +928,20 @@ mode.versus={
 				else{
 					if(ui.autoreplace.classList.contains('on')){
 						if(trigger.name!='phase'){
-							game.modeSwapPlayer(player);
+							game.versusSwapControl(player);
 							if(ui.dialog){
 								ui.dialog.style.display='';
 							}
 						}
 					}
 					else if(trigger.name=='phase'){
-						game.modeSwapPlayer(player);
+						game.versusSwapControl(player);
 					}
 					event.finish();
 				}
 				"step 1"
 				if(result.bool){
-					game.modeSwapPlayer(player);
+					game.versusSwapControl(player);
 					if(ui.dialog){
 						ui.dialog.style.display='';
 					}
diff --git a/theme/music/style.css b/theme/music/style.css
index acf4794e8..9711f9972 100644
--- a/theme/music/style.css
+++ b/theme/music/style.css
@@ -31,13 +31,11 @@ html{
 .selected{
 	box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(255, 0, 0, 0.8) 0 0 15px !important;
 }
-.card:not(*:empty){
-	color:rgb(77, 60, 51);
-	text-shadow:none;
+.card.fullskin{
 	background: url('wood3.png');
 }
-#me>div>.card,#arena>.card:not(*:empty){
-	box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px;
+.card{
+	color: white;
 }
 .fire{
 	color: rgb(255,119,63);