diff --git a/force-app/main/default/flows/NKS_Case_Log_Call_v_2.flow-meta.xml b/force-app/main/default/flows/NKS_Case_Log_Call_v_2.flow-meta.xml
index c81e69f83..90c41fb32 100644
--- a/force-app/main/default/flows/NKS_Case_Log_Call_v_2.flow-meta.xml
+++ b/force-app/main/default/flows/NKS_Case_Log_Call_v_2.flow-meta.xml
@@ -35,6 +35,12 @@
                 <elementReference>$User.Department</elementReference>
             </value>
         </inputParameters>
+        <inputParameters>
+            <name>Journal_Subtheme_Code</name>
+            <value>
+                <elementReference>Selected_Subtheme</elementReference>
+            </value>
+        </inputParameters>
         <inputParameters>
             <name>Journal_Theme_Code</name>
             <value>
@@ -261,6 +267,13 @@
                 <elementReference>Selected_Theme_SF_Id</elementReference>
             </value>
         </assignmentItems>
+        <assignmentItems>
+            <assignToReference>Get_Case.NKS_Subtheme__c</assignToReference>
+            <operator>Assign</operator>
+            <value>
+                <elementReference>Selected_Subtheme_SF_Id</elementReference>
+            </value>
+        </assignmentItems>
         <connector>
             <targetReference>Journal_Conversation_Note_Assignment</targetReference>
         </connector>
@@ -1035,7 +1048,8 @@
         </connector>
         <fields>
             <name>Error_Text</name>
-            <fieldText>&lt;p&gt;&lt;strong style=&quot;color: rgb(0, 0, 0);&quot;&gt;Velg en temagruppe for å opprette samtalereferat.&lt;/strong&gt;&lt;/p&gt;</fieldText>
+            <fieldText>&lt;p&gt;&lt;strong style=&quot;color: rgb(0, 0, 0);&quot;&gt;Velg en
+                temagruppe for å opprette samtalereferat.&lt;/strong&gt;&lt;/p&gt;</fieldText>
             <fieldType>DisplayText</fieldType>
         </fields>
         <nextOrFinishButtonLabel>Prøv på nytt</nextOrFinishButtonLabel>
@@ -1082,7 +1096,8 @@
         </fields>
         <fields>
             <name>Disclaimer_Text_Journal</name>
-            <fieldText>&lt;p&gt;&lt;span style=&quot;background-color: rgb(255, 255, 255); color:
+            <fieldText>
+                &lt;p&gt;&lt;span style=&quot;background-color: rgb(255, 255, 255); color:
                 rgb(144, 133,
                 133);&quot;&gt;{!$Label.NKS_Conversation_Note_Disclaimer_Text}&lt;/span&gt;&lt;/p&gt;</fieldText>
             <fieldType>DisplayText</fieldType>
@@ -1145,6 +1160,14 @@
                 <assignToReference>Selected_Theme_Group_SF_Id</assignToReference>
                 <name>selectedThemeGroupSfId</name>
             </outputParameters>
+            <outputParameters>
+                <assignToReference>Selected_Subtheme</assignToReference>
+                <name>selectedSubtheme</name>
+            </outputParameters>
+            <outputParameters>
+                <assignToReference>Selected_Subtheme_SF_Id</assignToReference>
+                <name>selectedSubthemeSfId</name>
+            </outputParameters>
         </fields>
         <nextOrFinishButtonLabel>Journalfør og del med brukeren</nextOrFinishButtonLabel>
         <showFooter>true</showFooter>
@@ -1183,7 +1206,8 @@
         </fields>
         <fields>
             <name>Disclaimer_Text</name>
-            <fieldText>&lt;p&gt;&lt;span style=&quot;color: rgb(144, 133,
+            <fieldText>
+                &lt;p&gt;&lt;span style=&quot;color: rgb(144, 133,
                 133);&quot;&gt;{!$Label.NKS_Conversation_Note_Disclaimer_Text}&lt;/span&gt;&lt;/p&gt;</fieldText>
             <fieldType>DisplayText</fieldType>
         </fields>
@@ -1348,7 +1372,8 @@
         </fields>
         <fields>
             <name>Disclaimer_Text_Conversation_Note</name>
-            <fieldText>&lt;p&gt;&lt;span style=&quot;color: rgb(144, 133,
+            <fieldText>
+                &lt;p&gt;&lt;span style=&quot;color: rgb(144, 133,
                 133);&quot;&gt;{!$Label.NKS_Conversation_Note_Disclaimer_Text}&lt;/span&gt;&lt;/p&gt;</fieldText>
             <fieldType>DisplayText</fieldType>
         </fields>
@@ -1702,6 +1727,20 @@
         <isInput>false</isInput>
         <isOutput>false</isOutput>
     </variables>
+    <variables>
+        <name>Selected_Subtheme</name>
+        <dataType>String</dataType>
+        <isCollection>false</isCollection>
+        <isInput>false</isInput>
+        <isOutput>false</isOutput>
+    </variables>
+    <variables>
+        <name>Selected_Subtheme_SF_Id</name>
+        <dataType>String</dataType>
+        <isCollection>false</isCollection>
+        <isInput>false</isInput>
+        <isOutput>false</isOutput>
+    </variables>
     <variables>
         <name>Selected_Theme_Code</name>
         <dataType>String</dataType>
@@ -1745,4 +1784,4 @@
         <isInput>false</isInput>
         <isOutput>false</isOutput>
     </variables>
-</Flow>
+</Flow>
\ No newline at end of file
diff --git a/force-app/main/default/flows/NKS_Case_Log_a_Call.flow-meta.xml b/force-app/main/default/flows/NKS_Case_Log_a_Call.flow-meta.xml
index 049d61fd9..18380bd81 100644
--- a/force-app/main/default/flows/NKS_Case_Log_a_Call.flow-meta.xml
+++ b/force-app/main/default/flows/NKS_Case_Log_a_Call.flow-meta.xml
@@ -35,6 +35,12 @@
                 <elementReference>$User.Department</elementReference>
             </value>
         </inputParameters>
+        <inputParameters>
+            <name>Journal_Subtheme_Code</name>
+            <value>
+                <elementReference>Case_Overview.selectedSubtheme</elementReference>
+            </value>
+        </inputParameters>
         <inputParameters>
             <name>Journal_Theme_Code</name>
             <value>
@@ -47,6 +53,8 @@
                 <elementReference>Conversation_Note_Record.Id</elementReference>
             </value>
         </inputParameters>
+        <nameSegment>CRM_ConvNoteJournalHelper</nameSegment>
+        <versionSegment>1</versionSegment>
     </actionCalls>
     <apiVersion>49.0</apiVersion>
     <assignments>
@@ -301,6 +309,13 @@
                 <elementReference>Case_Overview.selectedCaseThemeSfId</elementReference>
             </value>
         </assignmentItems>
+        <assignmentItems>
+            <assignToReference>Get_Case.NKS_Subtheme__c</assignToReference>
+            <operator>Assign</operator>
+            <value>
+                <elementReference>Case_Overview.selectedSubthemeSfId</elementReference>
+            </value>
+        </assignmentItems>
         <connector>
             <targetReference>Conversation_Note_Assignment</targetReference>
         </connector>
@@ -420,7 +435,8 @@
         </rules>
     </decisions>
     <decisions>
-        <description>Checks the status if the case. If it is closed, the conversation note is already made.</description>
+        <description>Checks the status if the case. If it is closed, the conversation note is
+            already made.</description>
         <name>Check_Case_Status</name>
         <label>Check Case Status</label>
         <locationX>468</locationX>
@@ -573,9 +589,9 @@
         <name>CONV_NOTE_THEME_GROUP_CODDE</name>
         <dataType>String</dataType>
         <expression>IF({!Create_Journal_Entry.value},
-{!Case_Overview.selectedThemeGroup},
-{!Conversation_Theme_Categorization.themeGroupCode}
-)</expression>
+            {!Case_Overview.selectedThemeGroup},
+            {!Conversation_Theme_Categorization.themeGroupCode}
+            )</expression>
     </formulas>
     <interviewLabel>Case Log a Call {!$Flow.CurrentDateTime}</interviewLabel>
     <label>Case Log a Call</label>
@@ -1001,7 +1017,8 @@
         </fields>
         <fields>
             <name>Conversation_Summary</name>
-            <fieldText>&lt;p&gt;&lt;strong style=&quot;color: rgb(62, 62, 60); background-color: rgb(255, 255, 255);&quot;&gt;Flere handlinger&lt;/strong&gt;&lt;/p&gt;</fieldText>
+            <fieldText>&lt;p&gt;&lt;strong style=&quot;color: rgb(62, 62, 60); background-color:
+                rgb(255, 255, 255);&quot;&gt;Flere handlinger&lt;/strong&gt;&lt;/p&gt;</fieldText>
             <fieldType>DisplayText</fieldType>
             <visibilityRule>
                 <conditionLogic>and</conditionLogic>
@@ -1022,6 +1039,7 @@
             <defaultSelectedChoiceReference>Create_Nav_Task_Action</defaultSelectedChoiceReference>
             <fieldText>Velg handling:</fieldText>
             <fieldType>DropdownBox</fieldType>
+            <inputsOnNextNavToAssocScrn>UseStoredValues</inputsOnNextNavToAssocScrn>
             <isRequired>false</isRequired>
             <visibilityRule>
                 <conditionLogic>and</conditionLogic>
@@ -1194,7 +1212,9 @@
         </fields>
         <fields>
             <name>Disclaimer_Text</name>
-            <fieldText>&lt;p&gt;&lt;span style=&quot;font-size: 12px; color: rgb(144, 133, 133);&quot;&gt;Samtalereferatet blir delt med bruker når det opprettes.&lt;/span&gt;&lt;/p&gt;</fieldText>
+            <fieldText>&lt;p&gt;&lt;span style=&quot;font-size: 12px; color: rgb(144, 133,
+                133);&quot;&gt;Samtalereferatet blir delt med bruker når det
+                opprettes.&lt;/span&gt;&lt;/p&gt;</fieldText>
             <fieldType>DisplayText</fieldType>
         </fields>
         <fields>
@@ -1498,7 +1518,8 @@
         </fields>
         <fields>
             <name>Update_Account_Text</name>
-            <fieldText>&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Henvendelsen er ikke tilknyttet en bruker. Vennligst oppdater med riktig bruker referat skal knyttes til.&lt;/p&gt;</fieldText>
+            <fieldText>&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Henvendelsen er ikke tilknyttet en
+                bruker. Vennligst oppdater med riktig bruker referat skal knyttes til.&lt;/p&gt;</fieldText>
             <fieldType>DisplayText</fieldType>
         </fields>
         <fields>
@@ -1610,8 +1631,8 @@
         <isViewedAsPlainText>false</isViewedAsPlainText>
         <text>Takk for at du tok kontakt
 
-Du har fått informasjon om
--</text>
+            Du har fått informasjon om
+            -</text>
     </textTemplates>
     <variables>
         <name>Account_Name</name>
diff --git a/force-app/main/default/flows/NKS_Conversation_Note_Create_Journal_Entry.flow-meta.xml b/force-app/main/default/flows/NKS_Conversation_Note_Create_Journal_Entry.flow-meta.xml
index 642b5343a..c764b22bc 100644
--- a/force-app/main/default/flows/NKS_Conversation_Note_Create_Journal_Entry.flow-meta.xml
+++ b/force-app/main/default/flows/NKS_Conversation_Note_Create_Journal_Entry.flow-meta.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Flow xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>49.0</apiVersion>
+    <environments>Default</environments>
     <interviewLabel>Conversation Note Create Journal Entry {!$Flow.CurrentDateTime}</interviewLabel>
     <label>Conversation Note Create Journal Entry</label>
     <processMetadataValues>
@@ -26,7 +27,7 @@
         <name>Get_Conversation_Note</name>
         <label>Get Conversation Note</label>
         <locationX>176</locationX>
-        <locationY>158</locationY>
+        <locationY>134</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
             <targetReference>Journal_Screen</targetReference>
@@ -48,7 +49,7 @@
         <name>Journal_Screen</name>
         <label>Journal Screen</label>
         <locationX>176</locationX>
-        <locationY>278</locationY>
+        <locationY>242</locationY>
         <allowBack>false</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -97,7 +98,7 @@
         <name>Post_Journal_Entry</name>
         <label>Post Journal Entry</label>
         <locationX>176</locationX>
-        <locationY>398</locationY>
+        <locationY>350</locationY>
         <flowName>CRM_Journal_Conversation_Note</flowName>
         <inputAssignments>
             <name>Journal_Case_ID</name>
@@ -123,6 +124,12 @@
                 <elementReference>$User.Department</elementReference>
             </value>
         </inputAssignments>
+        <inputAssignments>
+            <name>Journal_Subtheme_Code</name>
+            <value>
+                <elementReference>Case_Overview.selectedSubtheme</elementReference>
+            </value>
+        </inputAssignments>
         <inputAssignments>
             <name>Journal_Theme_Code</name>
             <value>
diff --git a/force-app/main/default/flows/NKS_Conversation_Note_Journal_Case_v_2.flow-meta.xml b/force-app/main/default/flows/NKS_Conversation_Note_Journal_Case_v_2.flow-meta.xml
index 8a72018af..b31215cea 100644
--- a/force-app/main/default/flows/NKS_Conversation_Note_Journal_Case_v_2.flow-meta.xml
+++ b/force-app/main/default/flows/NKS_Conversation_Note_Journal_Case_v_2.flow-meta.xml
@@ -134,6 +134,14 @@
                 <assignToReference>Selected_Theme_SF_Id</assignToReference>
                 <name>selectedCaseThemeSfId</name>
             </outputParameters>
+            <outputParameters>
+                <assignToReference>Selected_Subtheme</assignToReference>
+                <name>selectedSubtheme</name>
+            </outputParameters>
+            <outputParameters>
+                <assignToReference>Selected_Subtheme_Id</assignToReference>
+                <name>selectedSubthemeSfId</name>
+            </outputParameters>
         </fields>
         <nextOrFinishButtonLabel>Journalfør</nextOrFinishButtonLabel>
         <showFooter>true</showFooter>
@@ -194,6 +202,12 @@
                 <elementReference>$User.Department</elementReference>
             </value>
         </inputAssignments>
+        <inputAssignments>
+            <name>Journal_Subtheme_Code</name>
+            <value>
+                <elementReference>Selected_Subtheme</elementReference>
+            </value>
+        </inputAssignments>
         <inputAssignments>
             <name>Journal_Theme_Code</name>
             <value>
@@ -257,6 +271,20 @@
         <isInput>false</isInput>
         <isOutput>false</isOutput>
     </variables>
+    <variables>
+        <name>Selected_Subtheme</name>
+        <dataType>String</dataType>
+        <isCollection>false</isCollection>
+        <isInput>false</isInput>
+        <isOutput>false</isOutput>
+    </variables>
+    <variables>
+        <name>Selected_Subtheme_Id</name>
+        <dataType>String</dataType>
+        <isCollection>false</isCollection>
+        <isInput>false</isInput>
+        <isOutput>false</isOutput>
+    </variables>
     <variables>
         <name>Selected_Theme</name>
         <dataType>String</dataType>