diff --git a/MVMCoreUI/Atoms/Buttons/ButtonModel.swift b/MVMCoreUI/Atoms/Buttons/ButtonModel.swift
index 9d9ad9c3..03eb7fc3 100644
--- a/MVMCoreUI/Atoms/Buttons/ButtonModel.swift
+++ b/MVMCoreUI/Atoms/Buttons/ButtonModel.swift
@@ -36,8 +36,8 @@ public class ButtonModel: MoleculeProtocol {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         title = try typeContainer.decode(String.self, forKey: .title)
-        action = try typeContainer.decodeModel(codingKey: .action, typeCodingKey: ActionCodingKey.type)
-        style = try typeContainer.decode(ButtonStyle.self, forKey: .style)
+        action = try typeContainer.decodeModel(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
+        style = try typeContainer.decodeIfPresent(ButtonStyle.self, forKey: .style)
     }
 
     public func encode(to encoder: Encoder) throws {
diff --git a/MVMCoreUI/Atoms/Buttons/CaretLinkModel.swift b/MVMCoreUI/Atoms/Buttons/CaretLinkModel.swift
index 3cc77a54..db2de2b0 100644
--- a/MVMCoreUI/Atoms/Buttons/CaretLinkModel.swift
+++ b/MVMCoreUI/Atoms/Buttons/CaretLinkModel.swift
@@ -45,7 +45,7 @@ public class CaretLinkModel: MoleculeProtocol {
         if let enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) {
             self.enabled = enabled
         }
-        action = try typeContainer.decodeModel(codingKey: .action, typeCodingKey: ActionCodingKey.type)
+        action = try typeContainer.decodeModel(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
     }
 
     public func encode(to encoder: Encoder) throws {
diff --git a/MVMCoreUI/Atoms/Buttons/LinkModel.swift b/MVMCoreUI/Atoms/Buttons/LinkModel.swift
index 6b3ff39e..e2fca66c 100644
--- a/MVMCoreUI/Atoms/Buttons/LinkModel.swift
+++ b/MVMCoreUI/Atoms/Buttons/LinkModel.swift
@@ -33,7 +33,7 @@ public class LinkModel: MoleculeProtocol {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
         title = try typeContainer.decode(String.self, forKey: .title)
-        action = try typeContainer.decodeModel(codingKey: .action, typeCodingKey: ActionCodingKey.type)
+        action = try typeContainer.decodeModel(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
         if let enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) {
             self.enabled = enabled
         }
diff --git a/MVMCoreUI/Molecules/Items/ListItemModel.swift b/MVMCoreUI/Molecules/Items/ListItemModel.swift
index bef2cb84..7208a2ce 100644
--- a/MVMCoreUI/Molecules/Items/ListItemModel.swift
+++ b/MVMCoreUI/Molecules/Items/ListItemModel.swift
@@ -28,7 +28,7 @@ import MVMCore
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: ListItemCodingKeys.self)
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
-        action = try typeContainer.decodeModelIfPresent(codingKey: .action, typeCodingKey: ActionCodingKey.type)
+        action = try typeContainer.decodeModelIfPresent(codingKey: .action, typeCodingKey: ActionCodingKey.actionType)
         hideArrow = try typeContainer.decodeIfPresent(Bool.self, forKey: .hideArrow)
         line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line)
         style = try typeContainer.decodeIfPresent(String.self, forKey: .style)
diff --git a/MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift b/MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
index 53d14e44..5bc59593 100644
--- a/MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
+++ b/MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
@@ -24,10 +24,11 @@ import Foundation
         ModelRegistry.register(TabsModel.self)
         ModelRegistry.register(ScrollerModel.self)
         ModelRegistry.register(CornerLabelsModel.self)
-        // buttons
         ModelRegistry.register(LineModel.self)
+        // buttons
         ModelRegistry.register(ButtonModel.self)
         ModelRegistry.register(TwoButtonViewModel.self)
+        ModelRegistry.register(LinkModel.self)
         // list items
         ModelRegistry.register(ListItemModel.self)
         ModelRegistry.register(DropDownListItemModel.self)