diff --git a/pydatalab/pyproject.toml b/pydatalab/pyproject.toml
index 12a3037d9..e81514185 100644
--- a/pydatalab/pyproject.toml
+++ b/pydatalab/pyproject.toml
@@ -132,7 +132,7 @@ dev-dependencies = [
 ]
 
 [tool.uv.sources]
-datalab-app-plugin-insitu = { git = "https://github.com/datalab-org/datalab-app-plugin-insitu.git", rev = "v0.2.0" }
+datalab-app-plugin-insitu = { git = "https://github.com/datalab-org/datalab-app-plugin-insitu.git", rev = "v0.3.0" }
 
 [tool.pytest.ini_options]
 addopts = "--cov-report=xml --cov ./src/pydatalab"
diff --git a/pydatalab/src/pydatalab/apps/echem/blocks.py b/pydatalab/src/pydatalab/apps/echem/blocks.py
index 6bf4ea864..4a6846971 100644
--- a/pydatalab/src/pydatalab/apps/echem/blocks.py
+++ b/pydatalab/src/pydatalab/apps/echem/blocks.py
@@ -38,7 +38,6 @@ class CycleBlock(DataBlock):
         ".txt",
         ".xls",
         ".xlsx",
-        ".txt",
         ".res",
         ".nda",
         ".ndax",
diff --git a/pydatalab/uv.lock b/pydatalab/uv.lock
index 05cb8646e..7dd7622fd 100644
--- a/pydatalab/uv.lock
+++ b/pydatalab/uv.lock
@@ -483,8 +483,8 @@ wheels = [
 
 [[package]]
 name = "datalab-app-plugin-insitu"
-version = "0.2.0"
-source = { git = "https://github.com/datalab-org/datalab-app-plugin-insitu.git?rev=v0.2.0#fe00a3f7f0179a62d1cbe5ee361a03eb23c5a0ae" }
+version = "0.3.0"
+source = { git = "https://github.com/datalab-org/datalab-app-plugin-insitu.git?rev=v0.3.0#030c1dd267d351f0c6cad71a105b3e778a087890" }
 dependencies = [
     { name = "datalab-server" },
     { name = "lmfit" },
@@ -610,7 +610,7 @@ dev = [
 [package.metadata]
 requires-dist = [
     { name = "bokeh", specifier = "~=2.4,<3.0" },
-    { name = "datalab-app-plugin-insitu", marker = "extra == 'app-plugins-git'", git = "https://github.com/datalab-org/datalab-app-plugin-insitu.git?rev=v0.2.0" },
+    { name = "datalab-app-plugin-insitu", marker = "extra == 'app-plugins-git'", git = "https://github.com/datalab-org/datalab-app-plugin-insitu.git?rev=v0.3.0" },
     { name = "datalab-server", extras = ["apps", "chat", "server"], marker = "extra == 'all'" },
     { name = "flask", marker = "extra == 'server'", specifier = "~=3.0" },
     { name = "flask-compress", marker = "extra == 'server'", specifier = "~=1.15" },
diff --git a/webapp/src/components/datablocks/UVVisInsituBlock.vue b/webapp/src/components/datablocks/UVVisInsituBlock.vue
index 18e6dc2b3..d03294433 100644
--- a/webapp/src/components/datablocks/UVVisInsituBlock.vue
+++ b/webapp/src/components/datablocks/UVVisInsituBlock.vue
@@ -89,7 +89,6 @@ import DataBlockBase from "@/components/datablocks/DataBlockBase";
 import FileSelectDropdown from "@/components/FileSelectDropdown";
 import FolderSelect from "@/components/FolderSelect";
 import BokehPlot from "@/components/BokehPlot";
-import vSelect from "vue-select";
 
 import { createComputedSetterForBlockField } from "@/field_utils.js";
 import { updateBlockFromServer } from "@/server_fetch_utils.js";
@@ -100,7 +99,6 @@ export default {
     FileSelectDropdown,
     FolderSelect,
     BokehPlot,
-    vSelect,
   },
   props: {
     item_id: {
diff --git a/webapp/src/components/datablocks/XRDInsituBlock.vue b/webapp/src/components/datablocks/XRDInsituBlock.vue
new file mode 100644
index 000000000..417f33201
--- /dev/null
+++ b/webapp/src/components/datablocks/XRDInsituBlock.vue
@@ -0,0 +1,233 @@
+<template>
+  <DataBlockBase :item_id="item_id" :block_id="block_id">
+    <div class="mb-2 d-flex align-items-center">
+      <label class="mr-2"><b>Mode:</b></label>
+      <div class="btn-group" role="group" aria-label="Mode toggle">
+        <button
+          type="button"
+          class="btn"
+          :class="isEchemMode ? 'btn-outline-secondary' : 'btn-secondary'"
+          @click="setMode('log')"
+        >
+          Temperature
+        </button>
+        <button
+          type="button"
+          class="btn"
+          :class="isEchemMode ? 'btn-secondary' : 'btn-outline-secondary'"
+          @click="setMode('echem')"
+        >
+          Electrochemistry
+        </button>
+      </div>
+    </div>
+    <FileSelectDropdown
+      v-model="file_id"
+      :item_id="item_id"
+      :block_id="block_id"
+      :extensions="blockInfo.attributes.accepted_file_extensions"
+      update-block-on-change
+      @change="onFileChange"
+    />
+    <div v-show="file_id">
+      <div class="row">
+        <div class="col-lg-4 col-md-6 col-sm-12 mb-2">
+          <label class="mr-2"><b>XRD folder name</b></label>
+          <FolderSelect
+            v-model="xrd_folder_name"
+            :options="availableFolders"
+            @update:model-value="onFolderSelected"
+          />
+        </div>
+        <div class="col-lg-4 col-md-6 col-sm-12 mb-2">
+          <label class="mr-2"><b>Log folder name</b></label>
+          <FolderSelect
+            v-model="time_series_folder_name"
+            :options="availableFolders"
+            @update:model-value="onFolderSelected"
+          />
+        </div>
+        <div v-if="isEchemMode" class="col-lg-4 col-md-6 col-sm-12 mb-2">
+          <label class="mr-2"><b>Echem folder name</b></label>
+          <FolderSelect
+            v-model="echem_folder_name"
+            :options="availableFolders"
+            @update:model-value="onFolderSelected"
+          />
+        </div>
+      </div>
+      <div v-if="folderNameError" class="alert alert-danger mt-2 mx-auto">
+        {{ folderNameError }}
+      </div>
+    </div>
+    <div class="form-inline mb-2">
+      <label class="mr-2"><b>Data granularity</b></label>
+      <input
+        v-model="data_granularity_buffer"
+        type="text"
+        class="form-control mr-3"
+        style="width: 100px; display: inline-block"
+      />
+      <label class="mr-2"><b>Sample granularity</b></label>
+      <input
+        v-model="sample_granularity_buffer"
+        type="text"
+        class="form-control"
+        style="width: 100px; display: inline-block"
+      />
+      <button class="btn btn-primary ml-3" @click="onGranularitySubmit">Apply</button>
+    </div>
+    <div
+      v-show="xrd_folder_name && time_series_folder_name"
+      class="row mt-2 text-center justify-content-center"
+    >
+      <div
+        id="bokehPlotContainer"
+        class="col-xl-10 col-lg-11 col-md-12 d-flex justify-content-center overflow-auto"
+      >
+        <BokehPlot :bokeh-plot-data="bokehPlotData" class="mw-100" />
+      </div>
+    </div>
+  </DataBlockBase>
+</template>
+
+<script>
+import DataBlockBase from "@/components/datablocks/DataBlockBase";
+import FileSelectDropdown from "@/components/FileSelectDropdown";
+import FolderSelect from "@/components/FolderSelect";
+import BokehPlot from "@/components/BokehPlot";
+
+import { createComputedSetterForBlockField } from "@/field_utils.js";
+import { updateBlockFromServer } from "@/server_fetch_utils.js";
+
+export default {
+  components: {
+    DataBlockBase,
+    FileSelectDropdown,
+    FolderSelect,
+    BokehPlot,
+  },
+  props: {
+    item_id: {
+      type: String,
+      required: true,
+    },
+    block_id: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      folderNameError: "",
+      isUpdating: false,
+    };
+  },
+  watch: {
+    data_granularity: {
+      immediate: true,
+      handler(newVal) {
+        this.data_granularity_buffer = newVal;
+      },
+    },
+    sample_granularity: {
+      immediate: true,
+      handler(newVal) {
+        this.sample_granularity_buffer = newVal;
+      },
+    },
+  },
+  computed: {
+    bokehPlotData() {
+      return this.$store.state.all_item_data[this.item_id]["blocks_obj"][this.block_id]
+        .bokeh_plot_data;
+    },
+    blockInfo() {
+      return this.$store.state.blocksInfos["insitu-xrd"];
+    },
+    all_files() {
+      return this.$store.state.all_item_data[this.item_id].files;
+    },
+    currentBlock() {
+      return this.$store.state.all_item_data[this.item_id]["blocks_obj"][this.block_id];
+    },
+    availableFolders() {
+      return this.currentBlock.available_folders || [];
+    },
+    xrd_folder_name: createComputedSetterForBlockField("xrd_folder_name"),
+    time_series_folder_name: createComputedSetterForBlockField("time_series_folder_name"),
+    echem_folder_name: createComputedSetterForBlockField("echem_folder_name"),
+    file_id: createComputedSetterForBlockField("file_id"),
+    folder_name: createComputedSetterForBlockField("folder_name"),
+    data_granularity: createComputedSetterForBlockField("data_granularity"),
+    sample_granularity: createComputedSetterForBlockField("sample_granularity"),
+    time_series_source: createComputedSetterForBlockField("time_series_source"),
+    isEchemMode() {
+      return this.time_series_source === "echem";
+    },
+  },
+  created() {
+    // Ensure time_series_source is set to "log" by default if not present
+    if (this.time_series_source === undefined || this.time_series_source === null) {
+      this.time_series_source = "log";
+    }
+  },
+  methods: {
+    setMode(mode) {
+      this.time_series_source = mode;
+      this.xrd_folder_name = "";
+      this.time_series_folder_name = "";
+      this.echem_folder_name = "";
+      this.folderNameError = "";
+      this.updateBlock();
+      console.info("Mode set to", mode);
+    },
+    onFileChange() {
+      this.xrd_folder_name = "";
+      this.time_series_folder_name = "";
+      this.echem_folder_name = "";
+      this.updateBlock();
+    },
+    onFolderSelected() {
+      if (
+        this.xrd_folder_name &&
+        this.time_series_folder_name &&
+        (!this.isEchemMode || this.echem_folder_name)
+      ) {
+        this.updateBlock();
+      }
+    },
+    onGranularitySubmit() {
+      const dataVal = parseFloat(this.data_granularity_buffer);
+      const sampleVal = parseFloat(this.sample_granularity_buffer);
+
+      if (!isNaN(dataVal)) this.data_granularity = dataVal;
+      if (!isNaN(sampleVal)) this.sample_granularity = sampleVal;
+
+      if (!isNaN(dataVal) || !isNaN(sampleVal)) {
+        this.updateBlock();
+      }
+    },
+    updateBlock() {
+      this.isLoading = true;
+      const foundFile = this.all_files.find((file) => file.immutable_id === this.file_id);
+      this.folder_name = foundFile?.name || "Folder not found";
+
+      const blockToUpdate = {
+        ...this.$store.state.all_item_data[this.item_id]["blocks_obj"][this.block_id],
+      };
+
+      updateBlockFromServer(this.item_id, this.block_id, blockToUpdate)
+        .then(() => {
+          this.isLoading = false;
+        })
+        .catch((error) => {
+          this.isLoading = false;
+          console.error("Error updating block:", error);
+        });
+    },
+  },
+};
+</script>
+
+<style scoped></style>
diff --git a/webapp/src/resources.js b/webapp/src/resources.js
index c110b0951..f92987765 100644
--- a/webapp/src/resources.js
+++ b/webapp/src/resources.js
@@ -2,6 +2,7 @@
 import DataBlockBase from "@/components/datablocks/DataBlockBase";
 import MediaBlock from "@/components/datablocks/MediaBlock";
 import XRDBlock from "@/components/datablocks/XRDBlock";
+import XRDInsituBlock from "@/components/datablocks/XRDInsituBlock";
 import ChatBlock from "@/components/datablocks/ChatBlock";
 import CycleBlock from "@/components/datablocks/CycleBlock";
 import NMRBlock from "@/components/datablocks/NMRBlock";
@@ -73,6 +74,7 @@ export const customBlockTypes = {
     component: UVVisInsituBlock,
     name: "UV-Vis insitu",
   },
+  "insitu-xrd": { description: "XRD insitu", component: XRDInsituBlock, name: "XRD insitu" },
 };
 
 export const itemTypes = {