diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml
index 1c7372a59c..63411a84da 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml
@@ -45,14 +45,14 @@
       collection: FootstepWater
       params:
         volume: 8
-  - type: SolutionContainerManager
-    solutions:
-      pool:
-        maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. 
-        reagents:
-        - ReagentId: CP14Water
-          Quantity: 9999999
-  - type: DrainableSolution
-    solution: pool
-  - type: Drink
-    solution: pool
\ No newline at end of file
+  #- type: SolutionContainerManager
+  #  solutions:
+  #    pool:
+  #      maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. 
+  #      reagents:
+  #      - ReagentId: CP14Water
+  #        Quantity: 9999999
+  #- type: DrainableSolution
+  #  solution: pool
+  #- type: Drink
+  #  solution: pool
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml
index e9c48d5755..c460071320 100644
--- a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml
+++ b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml
@@ -198,4 +198,68 @@
       noise:
         seed: 14
         frequency: 0.02
-        fractalType: None
\ No newline at end of file
+        fractalType: None
+    # River start
+    - !type:BiomeTileLayer
+      tile: CP14FloorDirt
+      threshold: 0.93
+      noise:
+        seed: 3
+        noiseType: OpenSimplex2
+        frequency: 0.003
+        lacunarity: 1.50
+        gain: 0.12
+        fractalType: Ridged
+        octaves: 1
+    - !type:BiomeEntityLayer
+      allowedTiles:
+        - CP14FloorDirt
+        - CP14FloorSand
+      threshold: 0.93
+      noise:
+        seed: 3
+        noiseType: OpenSimplex2
+        frequency: 0.003
+        lacunarity: 1.50
+        gain: 0.12
+        fractalType: Ridged
+        octaves: 1
+      entities:
+        - CP14FloorWater
+    # River end
+    # Lakes start
+    - !type:BiomeTileLayer
+      tile: CP14FloorSand
+      threshold: 0.55
+      noise:
+        seed: 14
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        frequency: 0.01
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 150
+    - !type:BiomeTileLayer
+      tile: CP14FloorDirt
+      threshold: 0.68
+      noise:
+        seed: 14
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        frequency: 0.01
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 150
+    - !type:BiomeEntityLayer
+      allowedTiles:
+        - CP14FloorDirt
+        - CP14FloorSand
+      threshold: 0.6
+      noise:
+        seed: 14
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        frequency: 0.01
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 150
+      entities:
+        - CP14FloorWater
+    # Lakes end
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/meta.json b/Resources/Textures/_CP14/Tiles/Water/water.rsi/meta.json
index 734c9837c5..e6981840e5 100644
--- a/Resources/Textures/_CP14/Tiles/Water/water.rsi/meta.json
+++ b/Resources/Textures/_CP14/Tiles/Water/water.rsi/meta.json
@@ -15,28 +15,28 @@
       "directions": 4,
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ]
       ]
     },
@@ -45,28 +45,28 @@
       "directions": 4,
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ]
       ]
     },
@@ -75,28 +75,28 @@
       "directions": 4,
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ]
       ]
     },
@@ -105,28 +105,28 @@
       "directions": 4,
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ]
       ]
     },
@@ -135,28 +135,28 @@
       "directions": 4,
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ]
       ]
     },
@@ -165,28 +165,28 @@
       "directions": 4,
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ]
       ]
     },
@@ -195,28 +195,28 @@
       "directions": 4,
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ]
       ]
     },
@@ -225,28 +225,28 @@
       "directions": 4,
       "delays": [
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ],
         [
-          0.1,
-          0.1,
-          0.1,
-          0.1
+          0.25,
+          0.25,
+          0.25,
+          0.25
         ]
       ]
     }
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water0.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water0.png
index 8109c3094d..3cdf84c783 100644
Binary files a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water0.png and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water0.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water1.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water1.png
index 1109563ceb..9ba014e82f 100644
Binary files a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water1.png and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water1.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water2.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water2.png
index 8109c3094d..3cdf84c783 100644
Binary files a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water2.png and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water2.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water3.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water3.png
index 16d7e137ae..9020d340f1 100644
Binary files a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water3.png and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water3.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water4.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water4.png
index 098b30341f..0fa9df67d5 100644
Binary files a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water4.png and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water4.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water5.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water5.png
index 9ae6ed3249..4090a11e4b 100644
Binary files a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water5.png and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water5.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water6.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water6.png
index b7e6b62657..14415a8901 100644
Binary files a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water6.png and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water6.png differ
diff --git a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water7.png b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water7.png
index be3a56e6ba..71a9bf3237 100644
Binary files a/Resources/Textures/_CP14/Tiles/Water/water.rsi/water7.png and b/Resources/Textures/_CP14/Tiles/Water/water.rsi/water7.png differ