diff --git a/client b/client
index 2e4b1589..dea91c5b 160000
--- a/client
+++ b/client
@@ -1 +1 @@
-Subproject commit 2e4b158935ea31e1cf0c8504b6293d36ec703edb
+Subproject commit dea91c5be6b0767c2f575102abe2bea31b3c34cb
diff --git a/client-gui2 b/client-gui2
index cc532d80..20ef0526 160000
--- a/client-gui2
+++ b/client-gui2
@@ -1 +1 @@
-Subproject commit cc532d80270212a81d6d5075df0daaef48fa1d08
+Subproject commit 20ef05269ef999d159e6668599baa4c8de540363
diff --git a/common/proto/document_data.proto b/common/proto/document_data.proto
index 9604ac4e..4e2add87 100644
--- a/common/proto/document_data.proto
+++ b/common/proto/document_data.proto
@@ -24,6 +24,7 @@ message SaveDocumentRequest {
   repeated SourceRecord source_records = 1;
   string template_name = 2;
   string data_json = 3;
+  int64 expected_template_version_id = 4;
 }
 
 message RegisterTypstTemplateRequest {
@@ -73,6 +74,8 @@ message GetDocumentsRequest {
   optional int64 schema_id = 1;
   uint32 limit = 2;
   optional string template_name = 3;
+  optional string source_profile_name = 4;
+  optional string source_table_name = 5;
 }
 
 message Document {
diff --git a/common/src/proto/descriptor.bin b/common/src/proto/descriptor.bin
index 8e339ff0..9fe71702 100644
Binary files a/common/src/proto/descriptor.bin and b/common/src/proto/descriptor.bin differ
diff --git a/common/src/proto/komp_ac.document_data.rs b/common/src/proto/komp_ac.document_data.rs
index 9b39bdca..3d9a36d8 100644
--- a/common/src/proto/komp_ac.document_data.rs
+++ b/common/src/proto/komp_ac.document_data.rs
@@ -20,6 +20,8 @@ pub struct SaveDocumentRequest {
     pub template_name: ::prost::alloc::string::String,
     #[prost(string, tag = "3")]
     pub data_json: ::prost::alloc::string::String,
+    #[prost(int64, tag = "4")]
+    pub expected_template_version_id: i64,
 }
 #[derive(serde::Serialize, serde::Deserialize)]
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
@@ -100,6 +102,10 @@ pub struct GetDocumentsRequest {
     pub limit: u32,
     #[prost(string, optional, tag = "3")]
     pub template_name: ::core::option::Option<::prost::alloc::string::String>,
+    #[prost(string, optional, tag = "4")]
+    pub source_profile_name: ::core::option::Option<::prost::alloc::string::String>,
+    #[prost(string, optional, tag = "5")]
+    pub source_table_name: ::core::option::Option<::prost::alloc::string::String>,
 }
 #[derive(serde::Serialize, serde::Deserialize)]
 #[derive(Clone, PartialEq, ::prost::Message)]
diff --git a/komp-app/src/grpc.rs b/komp-app/src/grpc.rs
index bbb30c37..63558397 100644
--- a/komp-app/src/grpc.rs
+++ b/komp-app/src/grpc.rs
@@ -15,7 +15,10 @@ use common::proto::komp_ac::accounting::{
 use common::proto::komp_ac::common::Empty;
 use common::proto::komp_ac::document_data::{
     GetDocumentRequest, GetDocumentResponse, GetDocumentVersionRequest, GetDocumentVersionResponse,
-    GetDocumentsRequest, GetDocumentsResponse, SaveDocumentRequest, SaveDocumentResponse,
+    GetDocumentsRequest, GetDocumentsResponse, GetTypstTemplateVersionRequest,
+    GetTypstTemplateVersionResponse, ListEnabledTypstTemplatesRequest,
+    ListTypstTemplatesRequest, ListTypstTemplatesResponse, RegisterTypstTemplateRequest,
+    RegisterTypstTemplateResponse, SaveDocumentRequest, SaveDocumentResponse,
     UpdateDocumentRequest, UpdateDocumentResponse,
     document_data_service_client::DocumentDataServiceClient,
 };
@@ -32,8 +35,9 @@ use common::proto::komp_ac::table_definition::{
     GetProfileDetailsRequest, GetProfileDetailsResponse, GetTableCatalogRequest,
     GetTableCatalogResponse, ListColumnTypesResponse, PostTableDefinitionRequest,
     ProfileTreeResponse, PutTableDefinitionRequest, PutTableDefinitionResponse,
-    SetColumnPresentationRequest, SetColumnPresentationResponse, TableDefinitionResponse,
-    table_definition_client::TableDefinitionClient,
+    SetColumnFormVisibilityRequest, SetColumnFormVisibilityResponse,
+    SetColumnPresentationRequest, SetColumnPresentationResponse,
+    TableDefinitionResponse, table_definition_client::TableDefinitionClient,
 };
 use common::proto::komp_ac::table_script::{
     GetTableScriptsRequest, GetTableScriptsResponse, HydrateScriptDependenciesRequest,
@@ -561,6 +565,19 @@ impl GrpcClient {
         Ok(response.into_inner())
     }
 
+    pub async fn set_column_form_visibility(
+        &mut self,
+        request: SetColumnFormVisibilityRequest,
+    ) -> Result<SetColumnFormVisibilityResponse> {
+        let tonic_request = self.authenticated_request(request)?;
+        let response = self
+            .table_definition_client
+            .set_column_form_visibility(tonic_request)
+            .await
+            .context("gRPC SetColumnFormVisibility call failed")?;
+        Ok(response.into_inner())
+    }
+
     pub async fn post_table_script(
         &mut self,
         request: PostTableScriptRequest,
@@ -941,6 +958,48 @@ impl GrpcClient {
         Ok(response.into_inner())
     }
 
+    pub async fn list_enabled_typst_templates(
+        &mut self,
+        profile_name: String,
+    ) -> Result<ListTypstTemplatesResponse> {
+        let request = self.authenticated_request(ListEnabledTypstTemplatesRequest {
+            profile_name,
+        })?;
+        let response = self
+            .document_data_client
+            .list_enabled_typst_templates(request)
+            .await
+            .context("gRPC ListEnabledTypstTemplates call failed")?;
+        Ok(response.into_inner())
+    }
+
+    pub async fn list_typst_templates(
+        &mut self,
+        search: String,
+        limit: u32,
+    ) -> Result<ListTypstTemplatesResponse> {
+        let request = self.authenticated_request(ListTypstTemplatesRequest { search, limit })?;
+        let response = self
+            .document_data_client
+            .list_typst_templates(request)
+            .await
+            .context("gRPC ListTypstTemplates call failed")?;
+        Ok(response.into_inner())
+    }
+
+    pub async fn register_typst_template(
+        &mut self,
+        request: RegisterTypstTemplateRequest,
+    ) -> Result<RegisterTypstTemplateResponse> {
+        let request = self.authenticated_request(request)?;
+        let response = self
+            .document_data_client
+            .register_typst_template(request)
+            .await
+            .context("gRPC RegisterTypstTemplate call failed")?;
+        Ok(response.into_inner())
+    }
+
     pub async fn update_document(
         &mut self,
         request: UpdateDocumentRequest,
@@ -993,6 +1052,19 @@ impl GrpcClient {
         Ok(response.into_inner())
     }
 
+    pub async fn get_typst_template_version(
+        &mut self,
+        request: GetTypstTemplateVersionRequest,
+    ) -> Result<GetTypstTemplateVersionResponse> {
+        let request = self.authenticated_request(request)?;
+        let response = self
+            .document_data_client
+            .get_typst_template_version(request)
+            .await
+            .context("gRPC GetTypstTemplateVersion call failed")?;
+        Ok(response.into_inner())
+    }
+
     pub async fn search(
         &mut self,
         profile_name: String,
diff --git a/server b/server
index 9d960ff7..4852641e 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 9d960ff719c29b92a4fb43a1a19747d883d0659d
+Subproject commit 4852641efd0afa868bd4870693ac814e44416100