diff --git a/card/hearth.js b/card/hearth.js
index decf930fb..158e26b73 100644
--- a/card/hearth.js
+++ b/card/hearth.js
@@ -677,7 +677,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			linghunzhihuo:'灵魂之火',
 			linghunzhihuo_info:'对一名角色造成一点火焰伤害，然后随机弃置一张手牌',
 			shenenshu:'神恩术',
-			shenenshu_info:'出牌阶段对自己使用，获得一张随机基本牌，并将所有手牌替换为基本牌',
+			shenenshu_info:'出牌阶段对自己使用，将所有手牌（含此张）替换为基本牌',
 			zhiliaobo:'治疗波',
 			zhiliaobo_info:'出牌阶段对一名受伤角色使用，目标进行一次判定，若结果为红色，则回复一点体力，否则获得一点护甲',
 			yuansuhuimie:'元素毁灭',
diff --git a/card/swd.js b/card/swd.js
index 11c4ccf8a..14ecb71c3 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -5114,7 +5114,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			lingjiandai:'零件袋',
 			lingjiandai_info:'出牌阶段对自己使用，获得3张随机零件',
 			mujiaren:'木甲人',
-			mujiaren_info:'出牌阶段限用一次，获得一张随机机关牌，并将你手牌中的非基本牌替换为随机的机关牌',
+			mujiaren_info:'出牌阶段限用一次，将你手牌中的非基本牌（含此张）替换为随机的机关牌',
 			jiguanyaoshu:'机关要术',
 			jiguanyaoshu_skill:'巧匠',
 			jiguanyaoshu_skill_info:'每当你于回合外失去装备区内的牌，你获得一个随机零件',
diff --git a/character/gwent.js b/character/gwent.js
index 5b052e0ad..6d6ec8ba3 100644
--- a/character/gwent.js
+++ b/character/gwent.js
@@ -80,6 +80,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gw_yioufeisi:'国王还是乞丐，两者有何区别，人类少一个算一个',
 		},
 		skill:{
+			gwmaoxian_hengsaite_sha:{
+				trigger:{global:'damageAfter'},
+				silent:true,
+				filter:function(event){
+					return event.getParent(3).name=='gwmaoxian_hengsaite';
+				},
+				content:function(){
+					var card=game.createCard('sha');
+					player.gain(card);
+					player.$draw(card);
+				}
+			},
 			gwhuanshuang:{
 				trigger:{player:['phaseBegin','phaseEnd']},
 				direct:true,
@@ -3456,13 +3468,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				derivation:'gw_diandian',
 				image:'character/gw_hengsaite',
 				enable:true,
-				filterTarget:true,
+				notarget:true,
 				content:function(){
-					var list=[];
-					for(var i=0;i<3;i++){
-						list.push(game.createCard('sha'));
+					var targets=game.filterPlayer(function(current){
+						return player.canUse('wanjian',current);
+					}).sortBySeat();
+					if(targets.length){
+						player.addTempSkill('gwmaoxian_hengsaite_sha');
+						player.useCard({name:'wanjian'},targets);
 					}
-					target.gain(list,'gain2');
 				},
 				contentAfter:function(){
 					var evt=_status.event.getParent('phaseUse');
@@ -3474,9 +3488,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					value:10,
 					order:1,
 					result:{
-						target:function(player,target){
-							if(target==player) return 0.1;
-							return 1/Math.sqrt(target.countCards('h')+1);
+						player:function(player,target){
+							var targets=game.filterPlayer(function(current){
+								return player.canUse('wanjian',target);
+							});
+							var eff=0;
+							for(var i=0;i<targets.length;i++){
+								eff+=get.sgn(get.effect(targets[i],{name:'wanjian'},player,player))/Math.sqrt(targets[i].hp+1);
+							}
+							return get.sgn(eff);
 						}
 					}
 				}
@@ -4155,7 +4175,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gwmaoxian_yioufeisi:'伊欧菲斯',
 			gwmaoxian_yioufeisi_info:'选择两名角色，令目标依次视为对对方使用一张杀，然后结束出牌阶段',
 			gwmaoxian_luoqi:'罗契',
-			gwmaoxian_luoqi_info:'选择一名角色视为对其使用一张不计入出杀次数的杀，然后所有其他角色可以视为对其使用一张杀，然后结束出牌阶段',
+			gwmaoxian_luoqi_info:'选择一名角色视为对其使用一张不计入出杀次数的杀，然后所有其他角色可以对目标使用一张杀，然后结束出牌阶段',
 			gwmaoxian_jieluote:'杰洛特',
 			gwmaoxian_jieluote_info:'对一名角色造成一点伤害，若目标体力值大于2且为全场最多，改为造成2点伤害，然后结束出牌阶段',
 			gwmaoxian_yenaifa:'叶奈法',
@@ -4163,7 +4183,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gwmaoxian_telisi:'特丽斯',
 			gwmaoxian_telisi_info:'对至多3名随机友方角色施加一个随机正面效果，然后结束出牌阶段',
 			gwmaoxian_hengsaite:'亨赛特',
-			gwmaoxian_hengsaite_info:'令一名角色获得3张杀，然后结束出牌阶段',
+			gwmaoxian_hengsaite_info:'视为使用一张万箭齐发，每当有一名角色因此受到伤害，你获得一张杀，然后结束出牌阶段',
 			gwmaoxian_fuertaisite:'弗尔泰斯特',
 			gwmaoxian_fuertaisite_info:'令至多两名角色各获得一点护甲，然后结束出牌阶段',
 			gwmaoxian_laduoweide:'拉多维德',
diff --git a/game/game.js b/game/game.js
index d81673c2b..697bbeded 100644
--- a/game/game.js
+++ b/game/game.js
@@ -19891,6 +19891,7 @@
                     if(this.name){
                         this.classList.remove('epic');
 						this.classList.remove('legend');
+						this.classList.remove('gold');
                         this.classList.remove('unique');
 						this.style.background='';
                         var subtype=get.subtype(this);
@@ -19904,6 +19905,9 @@
                     else if(info.legend){
                         this.classList.add('legend');
                     }
+					else if(info.gold){
+						this.classList.add('gold');
+					}
 					else if(info.unique){
 						this.classList.add('unique');
 					}
diff --git a/game/update.js b/game/update.js
index 2e9fb73f3..2d50a593d 100644
--- a/game/update.js
+++ b/game/update.js
@@ -41,7 +41,7 @@ window.noname_update={
         // 'theme/music/style.css',
         // 'theme/woodden/style.css',
         // 'theme/simple/style.css',
-        // 'layout/default/layout.css',
+        'layout/default/layout.css',
         // 'layout/default/phone.css',
         // 'layout/default/menu.css',
         // 'theme/style/cardback/*',
diff --git a/layout/default/layout.css b/layout/default/layout.css
index e161dd804..7176a6c9a 100644
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -3839,7 +3839,7 @@ div[data-decoration="bronze"]::after{
 .card.fullskin.legend>.name {
 	color: white;
 	background: rgba(106, 27, 154, 0.6);
-	border: 1px solid rgba(106, 27, 154, 1);
+	border: 1px solid rgb(158, 102, 0);
 	box-shadow: rgba(0,0,0,0.4) 0 0 10px inset;
 }
 .card.fullskin.legend>.name2 {