diff --git a/packages/tiled/lib/src/chunk.dart b/packages/tiled/lib/src/chunk.dart
index 7ec0e8a..2b2d6b7 100644
--- a/packages/tiled/lib/src/chunk.dart
+++ b/packages/tiled/lib/src/chunk.dart
@@ -1,4 +1,4 @@
-part of '../tiled.dart';
+import 'package:tiled/tiled.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/common/color.dart b/packages/tiled/lib/src/common/color.dart
new file mode 100644
index 0000000..bb4380d
--- /dev/null
+++ b/packages/tiled/lib/src/common/color.dart
@@ -0,0 +1,53 @@
+import 'package:meta/meta.dart';
+
+/// Basic data class holding a Color in ARGB format.
+/// This can be converted to dart:ui's Color using the flame_tiled package
+@immutable
+class ColorData {
+  static int _sub(int hex, int index) => (hex >> index * 8) & 0x000000ff;
+
+  final int _hex;
+
+  int get alpha => _sub(_hex, 3);
+
+  int get red => _sub(_hex, 2);
+
+  int get green => _sub(_hex, 1);
+
+  int get blue => _sub(_hex, 0);
+
+  /// Parses the Color from an int using the lower 32-bits and tiled's format:
+  /// 0xaarrggbb
+  const ColorData.hex(this._hex);
+
+  const ColorData.rgb(int red, int green, int blue, [int alpha = 255])
+      : assert(red >= 0 && red <= 255),
+        assert(green >= 0 && green <= 255),
+        assert(blue >= 0 && blue <= 255),
+        assert(alpha >= 0 && alpha <= 255),
+        _hex = (alpha << 3 * 8) +
+            (red << 2 * 8) +
+            (green << 1 * 8) +
+            (blue << 0 * 8);
+
+  const ColorData.argb(int alpha, int red, int green, int blue)
+      : assert(red >= 0 && red <= 255),
+        assert(green >= 0 && green <= 255),
+        assert(blue >= 0 && blue <= 255),
+        assert(alpha >= 0 && alpha <= 255),
+        _hex = (alpha << 3 * 8) +
+            (red << 2 * 8) +
+            (green << 1 * 8) +
+            (blue << 0 * 8);
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! ColorData) {
+      return false;
+    }
+    return _hex == other._hex;
+  }
+
+  @override
+  int get hashCode => _hex.hashCode;
+}
diff --git a/packages/tiled/lib/src/common/enums.dart b/packages/tiled/lib/src/common/enums.dart
index 6145bc9..d8f8365 100644
--- a/packages/tiled/lib/src/common/enums.dart
+++ b/packages/tiled/lib/src/common/enums.dart
@@ -1,4 +1,4 @@
-part of '../../tiled.dart';
+import 'package:tiled/src/parser.dart';
 
 enum MapOrientation { orthogonal, isometric, staggered, hexagonal }
 
diff --git a/packages/tiled/lib/src/common/flips.dart b/packages/tiled/lib/src/common/flips.dart
index a32e510..b4c88e9 100644
--- a/packages/tiled/lib/src/common/flips.dart
+++ b/packages/tiled/lib/src/common/flips.dart
@@ -1,5 +1,3 @@
-part of '../../tiled.dart';
-
 class Flips {
   final bool horizontally;
   final bool vertically;
diff --git a/packages/tiled/lib/src/common/frame.dart b/packages/tiled/lib/src/common/frame.dart
index cd4b7d5..5c7b2a0 100644
--- a/packages/tiled/lib/src/common/frame.dart
+++ b/packages/tiled/lib/src/common/frame.dart
@@ -1,4 +1,4 @@
-part of '../../tiled.dart';
+import 'package:tiled/src/parser.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/common/gid.dart b/packages/tiled/lib/src/common/gid.dart
index 18475bb..286a071 100644
--- a/packages/tiled/lib/src/common/gid.dart
+++ b/packages/tiled/lib/src/common/gid.dart
@@ -1,4 +1,4 @@
-part of '../../tiled.dart';
+import 'package:tiled/tiled.dart';
 
 /// A [Gid], Global Tile ID is a Tiled concept to represent the tiles inside
 /// int matrices. This wrapper is used by [Layer] and [Chunk] to provide
diff --git a/packages/tiled/lib/src/common/point.dart b/packages/tiled/lib/src/common/point.dart
index 09c0289..60f006f 100644
--- a/packages/tiled/lib/src/common/point.dart
+++ b/packages/tiled/lib/src/common/point.dart
@@ -1,4 +1,4 @@
-part of '../../tiled.dart';
+import 'package:tiled/src/parser.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/common/property.dart b/packages/tiled/lib/src/common/property.dart
index 7433109..bf47770 100644
--- a/packages/tiled/lib/src/common/property.dart
+++ b/packages/tiled/lib/src/common/property.dart
@@ -1,4 +1,6 @@
-part of '../../tiled.dart';
+import 'package:collection/collection.dart';
+import 'package:tiled/tiled.dart';
+import 'package:xml/xml.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
@@ -37,7 +39,10 @@ class Property<T> {
       case PropertyType.color:
         return ColorProperty(
           name: name,
-          value: parser.getColor('value', defaults: const Color(0x00000000)),
+          value: parser.getColor(
+            'value',
+            defaults: const ColorData.hex(0x00000000),
+          ),
           hexValue: parser.getString('value', defaults: '#00000000'),
         );
 
@@ -156,7 +161,7 @@ class ObjectProperty extends Property<int> {
 }
 
 /// [value] is the color
-class ColorProperty extends Property<Color> {
+class ColorProperty extends Property<ColorData> {
   final String hexValue;
 
   ColorProperty({
diff --git a/packages/tiled/lib/src/common/tiled_image.dart b/packages/tiled/lib/src/common/tiled_image.dart
index 805344b..dd7ef88 100644
--- a/packages/tiled/lib/src/common/tiled_image.dart
+++ b/packages/tiled/lib/src/common/tiled_image.dart
@@ -1,4 +1,5 @@
-part of '../../tiled.dart';
+import 'package:meta/meta.dart';
+import 'package:tiled/src/parser.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/editor_setting/chunk_size.dart b/packages/tiled/lib/src/editor_setting/chunk_size.dart
index 90fe244..0b4bc2e 100644
--- a/packages/tiled/lib/src/editor_setting/chunk_size.dart
+++ b/packages/tiled/lib/src/editor_setting/chunk_size.dart
@@ -1,4 +1,4 @@
-part of '../../tiled.dart';
+import 'package:tiled/src/parser.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/editor_setting/editor_setting.dart b/packages/tiled/lib/src/editor_setting/editor_setting.dart
index 6ab86ed..bd88af4 100644
--- a/packages/tiled/lib/src/editor_setting/editor_setting.dart
+++ b/packages/tiled/lib/src/editor_setting/editor_setting.dart
@@ -1,4 +1,4 @@
-part of '../../tiled.dart';
+import 'package:tiled/tiled.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/editor_setting/export.dart b/packages/tiled/lib/src/editor_setting/export.dart
index 553b8f0..4c10ab9 100644
--- a/packages/tiled/lib/src/editor_setting/export.dart
+++ b/packages/tiled/lib/src/editor_setting/export.dart
@@ -1,4 +1,4 @@
-part of '../../tiled.dart';
+import 'package:tiled/src/parser.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/layer.dart b/packages/tiled/lib/src/layer.dart
index ab88f10..dd25967 100644
--- a/packages/tiled/lib/src/layer.dart
+++ b/packages/tiled/lib/src/layer.dart
@@ -1,4 +1,9 @@
-part of '../tiled.dart';
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:archive/archive.dart';
+import 'package:tiled/tiled.dart';
+import 'package:xml/xml.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
@@ -77,11 +82,11 @@ abstract class Layer {
   /// any graphics drawn by this layer or any child layers (optional).
   String? tintColorHex;
 
-  /// [Color] that is multiplied with any graphics drawn by this layer or any
-  /// child layers (optional).
+  /// [ColorData] that is multiplied with any graphics drawn by this layer or
+  /// any child layers (optional).
   ///
   /// Parsed from [tintColorHex], will be null if parsing fails for any reason.
-  Color? tintColor;
+  ColorData? tintColor;
 
   /// The opacity of the layer as a value from 0 to 1. Defaults to 1.
   double opacity;
@@ -420,7 +425,7 @@ class TileLayer extends Layer {
 }
 
 class ObjectGroup extends Layer {
-  static const defaultColor = Color.fromARGB(255, 160, 160, 164);
+  static const defaultColor = ColorData.rgb(160, 160, 164);
   static const defaultColorHex = '%a0a0a4';
 
   /// topdown (default) or index (indexOrder).
@@ -433,12 +438,12 @@ class ObjectGroup extends Layer {
   /// this group. (defaults to gray (“#a0a0a4”))
   String colorHex;
 
-  /// [Color] used to display the objects in this group.
+  /// [ColorData] used to display the objects in this group.
   /// (defaults to gray (“#a0a0a4”))
   ///
   /// Parsed from [colorHex], will be fallback to [defaultColor] if parsing
   /// fails for any reason.
-  Color color;
+  ColorData color;
 
   ObjectGroup({
     required super.name,
@@ -474,11 +479,11 @@ class ImageLayer extends Layer {
   /// (optional).
   String? transparentColorHex;
 
-  /// [Color] to be rendered as transparent (optional).
+  /// [ColorData] to be rendered as transparent (optional).
   ///
   /// Parsed from [transparentColorHex], will be null if parsing fails for any
   /// reason.
-  Color? transparentColor;
+  ColorData? transparentColor;
 
   /// Whether or not to repeat the image on the X-axis
   bool repeatX;
diff --git a/packages/tiled/lib/src/objects/text.dart b/packages/tiled/lib/src/objects/text.dart
index d505b58..4745beb 100644
--- a/packages/tiled/lib/src/objects/text.dart
+++ b/packages/tiled/lib/src/objects/text.dart
@@ -1,4 +1,4 @@
-part of '../../tiled.dart';
+import 'package:tiled/tiled.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/objects/tiled_object.dart b/packages/tiled/lib/src/objects/tiled_object.dart
index eafab7f..0bee7a1 100644
--- a/packages/tiled/lib/src/objects/tiled_object.dart
+++ b/packages/tiled/lib/src/objects/tiled_object.dart
@@ -1,4 +1,4 @@
-part of '../../tiled.dart';
+import 'package:tiled/tiled.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/parser.dart b/packages/tiled/lib/src/parser.dart
index c614e6b..7716eca 100644
--- a/packages/tiled/lib/src/parser.dart
+++ b/packages/tiled/lib/src/parser.dart
@@ -1,4 +1,5 @@
-part of '../tiled.dart';
+import 'package:tiled/tiled.dart';
+import 'package:xml/xml.dart';
 
 class ParsingException implements Exception {
   final String name;
@@ -206,7 +207,7 @@ abstract class Parser {
     return result;
   }
 
-  Color? getColorOrNull(String name, {Color? defaults}) {
+  ColorData? getColorOrNull(String name, {ColorData? defaults}) {
     final tiledColor = getStringOrNull(name);
 
     // Tiled colors are stored as either ARGB or RGB hex values, so we can
@@ -221,13 +222,13 @@ abstract class Parser {
     }
 
     if (colorValue != null) {
-      return Color(colorValue);
+      return ColorData.hex(colorValue);
     } else {
       return defaults;
     }
   }
 
-  Color getColor(String name, {Color? defaults}) {
+  ColorData getColor(String name, {ColorData? defaults}) {
     final result = getColorOrNull(name, defaults: defaults);
     if (result == null) {
       throw ParsingException(name, null, 'Missing required color field');
diff --git a/packages/tiled/lib/src/template.dart b/packages/tiled/lib/src/template.dart
index b0ac9c5..ea7a983 100644
--- a/packages/tiled/lib/src/template.dart
+++ b/packages/tiled/lib/src/template.dart
@@ -1,4 +1,4 @@
-part of '../tiled.dart';
+import 'package:tiled/tiled.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/tile_map_parser.dart b/packages/tiled/lib/src/tile_map_parser.dart
index 0d07ab4..534747c 100644
--- a/packages/tiled/lib/src/tile_map_parser.dart
+++ b/packages/tiled/lib/src/tile_map_parser.dart
@@ -1,4 +1,7 @@
-part of '../tiled.dart';
+import 'dart:convert';
+
+import 'package:tiled/tiled.dart';
+import 'package:xml/xml.dart';
 
 class TileMapParser {
   static TiledMap parseJson(String json) {
diff --git a/packages/tiled/lib/src/tiled_map.dart b/packages/tiled/lib/src/tiled_map.dart
index 33315e3..1a11973 100644
--- a/packages/tiled/lib/src/tiled_map.dart
+++ b/packages/tiled/lib/src/tiled_map.dart
@@ -1,4 +1,8 @@
-part of '../tiled.dart';
+import 'dart:collection';
+
+import 'package:collection/collection.dart';
+import 'package:tiled/tiled.dart';
+import 'package:xml/xml.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
@@ -74,12 +78,12 @@ class TiledMap {
   /// behind all other layers (optional).
   String? backgroundColorHex;
 
-  /// [Color] to be rendered as a solid color behind all other layers
+  /// [ColorData] to be rendered as a solid color behind all other layers
   /// (optional).
   ///
   /// Parsed from [backgroundColorHex], will be null if parsing fails for any
   /// reason.
-  Color? backgroundColor;
+  ColorData? backgroundColor;
 
   int compressionLevel;
 
diff --git a/packages/tiled/lib/src/tileset/grid.dart b/packages/tiled/lib/src/tileset/grid.dart
index b42298e..cb7e776 100644
--- a/packages/tiled/lib/src/tileset/grid.dart
+++ b/packages/tiled/lib/src/tileset/grid.dart
@@ -1,4 +1,4 @@
-part of '../../tiled.dart';
+import 'package:tiled/tiled.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/tileset/terrain.dart b/packages/tiled/lib/src/tileset/terrain.dart
index 4953251..315718b 100644
--- a/packages/tiled/lib/src/tileset/terrain.dart
+++ b/packages/tiled/lib/src/tileset/terrain.dart
@@ -1,4 +1,4 @@
-part of '../../tiled.dart';
+import 'package:tiled/tiled.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/tileset/tile.dart b/packages/tiled/lib/src/tileset/tile.dart
index 1798bf4..2c4b11a 100644
--- a/packages/tiled/lib/src/tileset/tile.dart
+++ b/packages/tiled/lib/src/tileset/tile.dart
@@ -1,4 +1,6 @@
-part of '../../tiled.dart';
+import 'dart:math';
+
+import 'package:tiled/tiled.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
@@ -27,7 +29,7 @@ class Tile {
   List<int?> terrain;
 
   TiledImage? image;
-  Rect? imageRect;
+  Rectangle? imageRect;
   Layer? objectGroup;
   List<Frame> animation;
   CustomProperties properties;
@@ -66,7 +68,7 @@ class Tile {
                   .toList() ??
               [],
           image: parser.getSingleChildOrNullAs('image', TiledImage.parse),
-          imageRect: Rect.fromLTWH(
+          imageRect: Rectangle(
             parser.getDoubleOrNull('x') ?? 0,
             parser.getDoubleOrNull('y') ?? 0,
             parser.getDoubleOrNull('width') ?? 0,
diff --git a/packages/tiled/lib/src/tileset/tile_offset.dart b/packages/tiled/lib/src/tileset/tile_offset.dart
index 1529be8..3ed8139 100644
--- a/packages/tiled/lib/src/tileset/tile_offset.dart
+++ b/packages/tiled/lib/src/tileset/tile_offset.dart
@@ -1,4 +1,4 @@
-part of '../../tiled.dart';
+import 'package:tiled/src/parser.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/tileset/tileset.dart b/packages/tiled/lib/src/tileset/tileset.dart
index 848a587..0f1ac92 100644
--- a/packages/tiled/lib/src/tileset/tileset.dart
+++ b/packages/tiled/lib/src/tileset/tileset.dart
@@ -1,4 +1,6 @@
-part of '../../tiled.dart';
+import 'dart:math';
+
+import 'package:tiled/tiled.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
@@ -230,7 +232,7 @@ class Tileset {
     final tiles = <Tile>[];
 
     for (var i = 0; i < tileCount; ++i) {
-      Rect? imageRect;
+      Rectangle? imageRect;
 
       if (columns != null &&
           columns != 0 &&
@@ -239,7 +241,7 @@ class Tileset {
         final x = (i % columns) * tileWidth;
         final y = i ~/ columns * tileHeight;
 
-        imageRect = Rect.fromLTWH(
+        imageRect = Rectangle(
           x.toDouble(),
           y.toDouble(),
           tileWidth.toDouble(),
diff --git a/packages/tiled/lib/src/tileset/wang/wang_color.dart b/packages/tiled/lib/src/tileset/wang/wang_color.dart
index 9ef5972..447f476 100644
--- a/packages/tiled/lib/src/tileset/wang/wang_color.dart
+++ b/packages/tiled/lib/src/tileset/wang/wang_color.dart
@@ -1,4 +1,4 @@
-part of '../../../tiled.dart';
+import 'package:tiled/tiled.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/tileset/wang/wang_set.dart b/packages/tiled/lib/src/tileset/wang/wang_set.dart
index ec15ee4..9d4273a 100644
--- a/packages/tiled/lib/src/tileset/wang/wang_set.dart
+++ b/packages/tiled/lib/src/tileset/wang/wang_set.dart
@@ -1,4 +1,4 @@
-part of '../../../tiled.dart';
+import 'package:tiled/tiled.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/tileset/wang/wang_tile.dart b/packages/tiled/lib/src/tileset/wang/wang_tile.dart
index 11b313f..bece334 100644
--- a/packages/tiled/lib/src/tileset/wang/wang_tile.dart
+++ b/packages/tiled/lib/src/tileset/wang/wang_tile.dart
@@ -1,4 +1,6 @@
-part of '../../../tiled.dart';
+import 'dart:typed_data';
+
+import 'package:tiled/src/parser.dart';
 
 /// Below is Tiled's documentation about how this structure is represented
 /// on XML files:
diff --git a/packages/tiled/lib/src/tsx_provider.dart b/packages/tiled/lib/src/tsx_provider.dart
index e2090b4..bc5a84b 100644
--- a/packages/tiled/lib/src/tsx_provider.dart
+++ b/packages/tiled/lib/src/tsx_provider.dart
@@ -1,4 +1,4 @@
-part of '../tiled.dart';
+import 'package:tiled/tiled.dart';
 
 /// abstract class to be implemented for an external tileset data provider.
 abstract class TsxProvider {
diff --git a/packages/tiled/lib/tiled.dart b/packages/tiled/lib/tiled.dart
index 4907cc5..e0a7f2f 100644
--- a/packages/tiled/lib/tiled.dart
+++ b/packages/tiled/lib/tiled.dart
@@ -1,40 +1,28 @@
-library tiled;
-
-import 'dart:collection';
-import 'dart:convert';
-import 'dart:math' show Rectangle;
-import 'dart:typed_data';
-import 'dart:ui';
-
-import 'package:archive/archive.dart';
-import 'package:collection/collection.dart';
-import 'package:meta/meta.dart';
-import 'package:xml/xml.dart';
-
-part 'src/chunk.dart';
-part 'src/common/enums.dart';
-part 'src/common/flips.dart';
-part 'src/common/frame.dart';
-part 'src/common/gid.dart';
-part 'src/common/point.dart';
-part 'src/common/property.dart';
-part 'src/common/tiled_image.dart';
-part 'src/editor_setting/chunk_size.dart';
-part 'src/editor_setting/editor_setting.dart';
-part 'src/editor_setting/export.dart';
-part 'src/layer.dart';
-part 'src/objects/text.dart';
-part 'src/objects/tiled_object.dart';
-part 'src/parser.dart';
-part 'src/template.dart';
-part 'src/tile_map_parser.dart';
-part 'src/tiled_map.dart';
-part 'src/tileset/grid.dart';
-part 'src/tileset/terrain.dart';
-part 'src/tileset/tile.dart';
-part 'src/tileset/tile_offset.dart';
-part 'src/tileset/tileset.dart';
-part 'src/tileset/wang/wang_color.dart';
-part 'src/tileset/wang/wang_set.dart';
-part 'src/tileset/wang/wang_tile.dart';
-part 'src/tsx_provider.dart';
+export 'src/chunk.dart';
+export 'src/common/color.dart';
+export 'src/common/enums.dart';
+export 'src/common/flips.dart';
+export 'src/common/frame.dart';
+export 'src/common/gid.dart';
+export 'src/common/point.dart';
+export 'src/common/property.dart';
+export 'src/common/tiled_image.dart';
+export 'src/editor_setting/chunk_size.dart';
+export 'src/editor_setting/editor_setting.dart';
+export 'src/editor_setting/export.dart';
+export 'src/layer.dart';
+export 'src/objects/text.dart';
+export 'src/objects/tiled_object.dart';
+export 'src/parser.dart';
+export 'src/template.dart';
+export 'src/tile_map_parser.dart';
+export 'src/tiled_map.dart';
+export 'src/tileset/grid.dart';
+export 'src/tileset/terrain.dart';
+export 'src/tileset/tile.dart';
+export 'src/tileset/tile_offset.dart';
+export 'src/tileset/tileset.dart';
+export 'src/tileset/wang/wang_color.dart';
+export 'src/tileset/wang/wang_set.dart';
+export 'src/tileset/wang/wang_tile.dart';
+export 'src/tsx_provider.dart';
diff --git a/packages/tiled/pubspec.yaml b/packages/tiled/pubspec.yaml
index 97a5c6b..abdb17b 100644
--- a/packages/tiled/pubspec.yaml
+++ b/packages/tiled/pubspec.yaml
@@ -7,15 +7,12 @@ environment:
   sdk: ">=2.18.0 <3.0.0"
 
 dependencies:
-  archive: ">=3.3.0 <5.0.0"
+  archive: ^4.0.2
   collection: ^1.16.0
-  flutter:
-    sdk: flutter
   meta: ^1.7.0
   xml: ^6.1.0
 
 dev_dependencies:
   dartdoc: ^8.3.1
   flame_lint: ^1.1.2
-  flutter_test:
-    sdk: flutter
+  test: ^1.24.8
diff --git a/packages/tiled/test/color.dart b/packages/tiled/test/color.dart
new file mode 100644
index 0000000..3bd7a38
--- /dev/null
+++ b/packages/tiled/test/color.dart
@@ -0,0 +1,25 @@
+import 'dart:math';
+
+import 'package:test/expect.dart';
+import 'package:test/scaffolding.dart';
+import 'package:tiled/tiled.dart';
+
+void main() {
+  group('ColorData.hex', () {
+    test('parse', () {
+      final random = Random();
+      final red = random.nextInt(256);
+      final green = random.nextInt(256);
+      final blue = random.nextInt(256);
+      final alpha = random.nextInt(256);
+
+      final hex = alpha << 24 | red << 16 | green << 8 | blue << 0;
+      final data = ColorData.hex(hex);
+
+      expect(data.alpha, equals(alpha));
+      expect(data.red, equals(red));
+      expect(data.green, equals(green));
+      expect(data.blue, equals(blue));
+    });
+  });
+}
diff --git a/packages/tiled/test/complexmap_infinite_test.dart b/packages/tiled/test/complexmap_infinite_test.dart
index 5ab581c..ca5bf49 100644
--- a/packages/tiled/test/complexmap_infinite_test.dart
+++ b/packages/tiled/test/complexmap_infinite_test.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {
diff --git a/packages/tiled/test/image_layer_test.dart b/packages/tiled/test/image_layer_test.dart
index da3a9c6..8996c45 100644
--- a/packages/tiled/test/image_layer_test.dart
+++ b/packages/tiled/test/image_layer_test.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {
diff --git a/packages/tiled/test/isometric_staggered_test.dart b/packages/tiled/test/isometric_staggered_test.dart
index 00e9e33..4e13832 100644
--- a/packages/tiled/test/isometric_staggered_test.dart
+++ b/packages/tiled/test/isometric_staggered_test.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {
diff --git a/packages/tiled/test/isometric_test.dart b/packages/tiled/test/isometric_test.dart
index 66c61bc..9c28c6a 100644
--- a/packages/tiled/test/isometric_test.dart
+++ b/packages/tiled/test/isometric_test.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {
diff --git a/packages/tiled/test/layer_test.dart b/packages/tiled/test/layer_test.dart
index 984b46f..d967704 100644
--- a/packages/tiled/test/layer_test.dart
+++ b/packages/tiled/test/layer_test.dart
@@ -1,7 +1,6 @@
 import 'dart:io';
-import 'dart:ui';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {
@@ -75,7 +74,7 @@ void main() {
       expect(layer.tintColorHex, equals('#ffaabb'));
       expect(
         layer.tintColor,
-        equals(Color(int.parse('0xffffaabb'))),
+        equals(ColorData.hex(int.parse('0xffffaabb'))),
       );
     });
   });
diff --git a/packages/tiled/test/map_test.dart b/packages/tiled/test/map_test.dart
index 7f91085..b051f8c 100644
--- a/packages/tiled/test/map_test.dart
+++ b/packages/tiled/test/map_test.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {
diff --git a/packages/tiled/test/object_alignment_test.dart b/packages/tiled/test/object_alignment_test.dart
index c65dc29..7712316 100644
--- a/packages/tiled/test/object_alignment_test.dart
+++ b/packages/tiled/test/object_alignment_test.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {
diff --git a/packages/tiled/test/object_group_test.dart b/packages/tiled/test/object_group_test.dart
index d0692cf..0287622 100644
--- a/packages/tiled/test/object_group_test.dart
+++ b/packages/tiled/test/object_group_test.dart
@@ -1,7 +1,6 @@
 import 'dart:io';
-import 'dart:ui';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {
@@ -31,7 +30,7 @@ void main() {
       expect(objectGroup.colorHex, equals('#555500'));
       expect(
         objectGroup.color,
-        equals(Color(int.parse('0xff555500'))),
+        equals(ColorData.hex(int.parse('0xff555500'))),
       );
     });
 
diff --git a/packages/tiled/test/overflow_bug_test.dart b/packages/tiled/test/overflow_bug_test.dart
index 481c888..27e62b7 100644
--- a/packages/tiled/test/overflow_bug_test.dart
+++ b/packages/tiled/test/overflow_bug_test.dart
@@ -2,7 +2,7 @@
 
 import 'dart:io';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {
diff --git a/packages/tiled/test/parser_compare_test.dart b/packages/tiled/test/parser_compare_test.dart
index ab052d0..4e8b421 100644
--- a/packages/tiled/test/parser_compare_test.dart
+++ b/packages/tiled/test/parser_compare_test.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {
diff --git a/packages/tiled/test/parser_test.dart b/packages/tiled/test/parser_test.dart
index d015dc7..3ec9f5e 100644
--- a/packages/tiled/test/parser_test.dart
+++ b/packages/tiled/test/parser_test.dart
@@ -1,9 +1,8 @@
 import 'dart:io';
 import 'dart:math' show Rectangle;
-import 'dart:ui';
 
 import 'package:collection/collection.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 import 'package:xml/xml.dart';
 
@@ -45,7 +44,7 @@ void main() {
       expect(map.backgroundColorHex, equals('#ccddaaff'));
       expect(
         map.backgroundColor,
-        equals(Color(int.parse('0xccddaaff'))),
+        equals(ColorData.hex(int.parse('0xccddaaff'))),
       );
     });
 
@@ -89,10 +88,10 @@ void main() {
             equals('test_value'),
           );
           expect(
-            properties
-                .getValue<String>('multiline string')
-                ?.replaceAll('\r\n', '\n'),
-            equals('Hello,\nWorld'),
+            properties.getValue<String>('multiline string'),
+            Platform.isWindows
+                ? equals('Hello,\r\nWorld')
+                : equals('Hello,\nWorld'),
           );
           expect(
             properties.getValue<int>('integer property'),
@@ -103,8 +102,8 @@ void main() {
             equals('#00112233'),
           );
           expect(
-            properties.getValue<Color>('color property'),
-            equals(const Color(0x00112233)),
+            properties.getValue<ColorData>('color property'),
+            equals(const ColorData.hex(0x00112233)),
           );
           expect(
             properties.getValue<double>('float property'),
diff --git a/packages/tiled/test/rectangle_map_test.dart b/packages/tiled/test/rectangle_map_test.dart
index 7e70418..797bb5b 100644
--- a/packages/tiled/test/rectangle_map_test.dart
+++ b/packages/tiled/test/rectangle_map_test.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {
diff --git a/packages/tiled/test/tile_test.dart b/packages/tiled/test/tile_test.dart
index db85d8e..c91e049 100644
--- a/packages/tiled/test/tile_test.dart
+++ b/packages/tiled/test/tile_test.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
-import 'dart:ui';
+import 'dart:math';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 import 'package:xml/xml.dart';
 
@@ -58,8 +58,8 @@ void main() {
         final tile1 = tileset1.tiles.firstWhere((t) => t.localId == 0);
         final tile2 = tileset1.tiles.firstWhere((t) => t.localId == 1);
 
-        expect(tile1.imageRect, const Rect.fromLTWH(64, 96, 32, 32));
-        expect(tile2.imageRect, const Rect.fromLTWH(0, 0, 20, 20));
+        expect(tile1.imageRect, const Rectangle(64, 96, 32, 32));
+        expect(tile2.imageRect, const Rectangle(0, 0, 20, 20));
       });
 
       test(
@@ -70,10 +70,10 @@ void main() {
           final tile3 = tileset2.tiles.firstWhere((t) => t.localId == 129);
           final tile4 = tileset2.tiles.firstWhere((t) => t.localId == 11);
 
-          expect(tile1.imageRect, const Rect.fromLTWH(112, 48, 16, 16));
-          expect(tile2.imageRect, const Rect.fromLTWH(64, 96, 16, 16));
-          expect(tile3.imageRect, const Rect.fromLTWH(160, 112, 16, 16));
-          expect(tile4.imageRect, const Rect.fromLTWH(176, 0, 16, 16));
+          expect(tile1.imageRect, const Rectangle(112, 48, 16, 16));
+          expect(tile2.imageRect, const Rectangle(64, 96, 16, 16));
+          expect(tile3.imageRect, const Rectangle(160, 112, 16, 16));
+          expect(tile4.imageRect, const Rectangle(176, 0, 16, 16));
         },
       );
     },
diff --git a/packages/tiled/test/tileset_test.dart b/packages/tiled/test/tileset_test.dart
index 3670f8a..516fd97 100644
--- a/packages/tiled/test/tileset_test.dart
+++ b/packages/tiled/test/tileset_test.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 import 'package:xml/xml.dart';
 
diff --git a/packages/tiled/test/tmx_object_test.dart b/packages/tiled/test/tmx_object_test.dart
index f58d90a..8579ed6 100644
--- a/packages/tiled/test/tmx_object_test.dart
+++ b/packages/tiled/test/tmx_object_test.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {