diff --git a/app/src/main/assets/data/common/tooling-api-all.jar b/app/src/main/assets/data/common/tooling-api-all.jar
index 8276f77e8..7e37a6120 100644
Binary files a/app/src/main/assets/data/common/tooling-api-all.jar and b/app/src/main/assets/data/common/tooling-api-all.jar differ
diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/FileTypeAdapter.java b/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/FileTypeAdapter.java
index 0ac7a9d20..8204acf06 100644
--- a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/FileTypeAdapter.java
+++ b/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/FileTypeAdapter.java
@@ -37,29 +37,21 @@ public class FileTypeAdapter extends TypeAdapter<File> {
   
   @Override
   public void write(final JsonWriter out, final File value) throws IOException {
-    out.name("path");
+    if (value == null) {
+      out.nullValue();
+      return;
+    }
+    
     out.value(value.getPath());
   }
   
   @Override
   public File read(final JsonReader in) throws IOException {
-    final var next = in.peek();
-    if (next == JsonToken.NULL) {
-      return null;
-    }
-    in.beginObject();
-    final String name = in.nextName();
-    if (!"path".equals(name)) {
-      throw new JsonParseException("Expected 'path' but was '" + name + "'");
-    }
-    
-    final var path = in.nextString();
-    if (path == null) {
+    if (in.peek() == JsonToken.NULL) {
+      in.nextNull();
       return null;
     }
     
-    in.endObject();
-    
-    return new File(path);
+    return new File(in.nextString());
   }
 }
diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/IncludeView.kt b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/IncludeView.kt
index d17f8a836..a978d0294 100644
--- a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/IncludeView.kt
+++ b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/IncludeView.kt
@@ -18,7 +18,6 @@
 package com.itsaky.androidide.inflater.internal
 
 import com.itsaky.androidide.inflater.IAttribute
-import com.itsaky.androidide.inflater.IViewGroup
 
 /**
  * [IView][com.itsaky.androidide.inflater.IView] implementation for `<include>` tags.
@@ -37,10 +36,10 @@ class IncludeView(private val embedded: ViewImpl) :
   override fun applyAttribute(attribute: IAttribute) =
     // The attributes must be applied to the embedded view
     embedded.applyAttribute(attribute)
-  
+
   override fun onHighlightStateUpdated(highlight: Boolean) =
     embedded.onHighlightStateUpdated(highlight)
-  
+
   override fun removeFromParent() = embedded.removeFromParent()
 
   override fun printHierarchy() = embedded.printHierarchy()