diff --git a/CHANGELOG.md b/CHANGELOG.md
index 925e172..131e5b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@
     - Notes : Techniques in sheet need to be re-imported from the compendium or manually updated for this to work.
 - Compendiums :
     - Techniques : Added difficulty and skill values (not all techniques).
+- DicePicker :
+  - Added TN hidden difficulty visibility for GM.
+  - Added a selection for techniques with skill list.
 
 Syntaxe quick explanation :
 - Difficulty can be :
diff --git a/system/lang/en-en.json b/system/lang/en-en.json
index 8d6536f..5757e17 100644
--- a/system/lang/en-en.json
+++ b/system/lang/en-en.json
@@ -106,7 +106,7 @@
             "opportunities": "Opportunities",
             "strife": "Strife",
             "difficulty": "TN",
-            "difficulty_hidden": "TN ???",
+            "difficulty_hidden": "???",
             "dicepicker": "Dice Picker",
             "void_point_used": "Void point used",
             "assistance_used": "Skill assistance used",
diff --git a/system/lang/es-es.json b/system/lang/es-es.json
index 9910351..e1ad90d 100644
--- a/system/lang/es-es.json
+++ b/system/lang/es-es.json
@@ -106,7 +106,7 @@
             "opportunities": "Oportunidades",
             "strife": "Conflictos",
             "difficulty": "NO",
-            "difficulty_hidden": "NO ???",
+            "difficulty_hidden": "???",
             "dicepicker": "Dice Picker",
             "void_point_used": "Punto de Vacío utilizado",
             "assistance_used": "Asistencia de habilidad utilizada",
diff --git a/system/lang/fr-fr.json b/system/lang/fr-fr.json
index 8a6f1e6..9d095a0 100644
--- a/system/lang/fr-fr.json
+++ b/system/lang/fr-fr.json
@@ -106,7 +106,7 @@
             "opportunities": "Aubaines",
             "strife": "Conflits",
             "difficulty": "ND",
-            "difficulty_hidden": "ND ???",
+            "difficulty_hidden": "???",
             "dicepicker": "Dice Picker",
             "void_point_used": "Point de vide utilisé",
             "assistance_used": "Assistance de compétence utilisée",
diff --git a/system/scripts/dice/dice-picker-dialog.js b/system/scripts/dice/dice-picker-dialog.js
index dd11a84..fd75bd5 100644
--- a/system/scripts/dice/dice-picker-dialog.js
+++ b/system/scripts/dice/dice-picker-dialog.js
@@ -686,7 +686,7 @@ export class DicePickerDialog extends FormApplication {
             // 2: "vigilance"
             // 3: "max"
             // 4: "statusRank"
-            const infos = difficulty.match(CONFIG.l5r5e.techniqueDifficulty);
+            const infos = difficulty.match(CONFIG.l5r5e.regex.techniqueDifficulty);
             if (!infos) {
                 console.log("L5R5E | Fail to parse difficulty", difficulty);
                 return false;
@@ -721,12 +721,16 @@ export class DicePickerDialog extends FormApplication {
                 return false;
             }
 
+            // Before difficultyHiddenIsLock
+            this.difficulty = difficulty;
+
             // Hide npc stats on target
             if (infos[1] === "T") {
                 this.difficultyHidden = true;
                 this._difficultyHiddenIsLock.option = true;
                 this.object.difficulty.targetTokenId = targetTokenId;
             }
+            return true;
         }
 
         // finally
diff --git a/system/scripts/dice/roll-n-keep-dialog.js b/system/scripts/dice/roll-n-keep-dialog.js
index dec2ecd..07f6abf 100644
--- a/system/scripts/dice/roll-n-keep-dialog.js
+++ b/system/scripts/dice/roll-n-keep-dialog.js
@@ -231,6 +231,7 @@ export class RollnKeepDialog extends FormApplication {
 
         return {
             ...super.getData(options),
+            isGM: game.user.isGM,
             cssClass: this.options.classes.join(" "),
             data: this.object,
             l5r5e: this.roll.l5r5e,
diff --git a/system/templates/actors/twenty-questions-dialog.html b/system/templates/actors/twenty-questions-dialog.html
index fc3e868..6c39388 100644
--- a/system/templates/actors/twenty-questions-dialog.html
+++ b/system/templates/actors/twenty-questions-dialog.html
@@ -17,8 +17,8 @@
             <article class="tab parts part0" data-group="primary" data-tab="part0">
                 <h1>{{localize 'l5r5e.twenty_questions.title'}}</h1>
                 {{localize 'l5r5e.twenty_questions.part0.intro'}}
-                <br />
-                <br />
+                <br>
+                <br>
                 <label>
                     {{localize 'l5r5e.twenty_questions.part0.type'}}
                     <select name="template" class="skill-select">
@@ -29,8 +29,8 @@
                         {{/select}}
                     </select>
                 </label>
-                <br />
-                <br />
+                <br>
+                <br>
                 <i>{{localize (localize 'l5r5e.twenty_questions.part0.section{suffix}' suffix=suffix)}}</i>
                 <button class="next" name="next" type="button">{{localize 'l5r5e.twenty_questions.bt_next'}} <i class='fas fa-arrow-right'></i></button>
             </article>
diff --git a/system/templates/dice/chat-roll.html b/system/templates/dice/chat-roll.html
index c48f869..44028e0 100644
--- a/system/templates/dice/chat-roll.html
+++ b/system/templates/dice/chat-roll.html
@@ -22,7 +22,7 @@
 
             <span class="chat-profil-element">
                 {{#if l5r5e.difficultyHidden}}
-                    {{localize 'l5r5e.chatdices.difficulty_hidden'}}
+                    {{localize 'l5r5e.chatdices.difficulty'}} {{localize 'l5r5e.chatdices.difficulty_hidden'}}
                 {{else}}
                     {{localize 'l5r5e.chatdices.difficulty'}} {{l5r5e.difficulty}}
                 {{/if}}
diff --git a/system/templates/dice/roll-n-keep-dialog.html b/system/templates/dice/roll-n-keep-dialog.html
index 6ea9abe..b5f45ec 100644
--- a/system/templates/dice/roll-n-keep-dialog.html
+++ b/system/templates/dice/roll-n-keep-dialog.html
@@ -16,12 +16,17 @@
                 {{/if}}
             </li>
             <li class="chat-profil-element">
+                {{localize 'l5r5e.chatdices.difficulty'}}
                 {{#if l5r5e.difficultyHidden}}
-                    {{localize 'l5r5e.chatdices.difficulty_hidden'}}
+                    {{#if isGM}}
+                        ?{{l5r5e.difficulty}}?
+                    {{else}}
+                        {{localize 'l5r5e.chatdices.difficulty_hidden'}}
+                    {{/if}}
                 {{else}}
-                    {{localize 'l5r5e.chatdices.difficulty'}} {{l5r5e.difficulty}}
+                    {{l5r5e.difficulty}}
                 {{/if}}
-                <br />
+                <br>
                 {{#if l5r5e.voidPointUsed}}
                     <i class="i_void" title="{{localize 'l5r5e.chatdices.void_point_used'}}"></i>
                 {{/if}}