diff --git a/readme.md b/readme.md
index 6a6abd2..e9deb5e 100644
--- a/readme.md
+++ b/readme.md
@@ -447,7 +447,8 @@ PCB cameras.
 ### Properties
 | Function | Description |
 |:--- |:--- |
-| ```camera_connector(type)``` | The flex connector block for the camera itself |
+| ```camera_connector_pos(type)``` | The flex connector block for the camera itself's position |
+| ```camera_connector_size(type)``` | The flex connector block for the camera itself's size |
 | ```camera_lens(type)``` | Stack of lens parts, can be round, rectanular or rounded rectangular, with optional tapered aperture |
 | ```camera_lens_offset(type)``` | Offset of the lens center from the PCB centre |
 | ```camera_pcb(type)``` | The PCB part of the camera |
diff --git a/tests/png/cameras.png b/tests/png/cameras.png
index 23fa280..4b676d7 100644
Binary files a/tests/png/cameras.png and b/tests/png/cameras.png differ
diff --git a/vitamins/camera.scad b/vitamins/camera.scad
index f86ed80..8ea0b27 100644
--- a/vitamins/camera.scad
+++ b/vitamins/camera.scad
@@ -23,10 +23,38 @@
 include <../utils/core/core.scad>
 use <pcb.scad>
 
-function camera_pcb(type)         = type[2]; //! The PCB part of the camera
-function camera_lens_offset(type) = type[3]; //! Offset of the lens center from the PCB centre
-function camera_lens(type)        = type[4]; //! Stack of lens parts, can be round, rectanular or rounded rectangular, with optional tapered aperture
-function camera_connector(type)   = type[5]; //! The flex connector block for the camera itself
+function camera_pcb(type)           = type[2]; //! The PCB part of the camera
+function camera_lens_offset(type)   = type[3]; //! Offset of the lens center from the PCB centre
+function camera_lens(type)          = type[4]; //! Stack of lens parts, can be round, rectanular or rounded rectangular, with optional tapered aperture
+function camera_connector_pos(type) = type[5]; //! The flex connector block for the camera itself's position
+function camera_connector_size(type)= type[6]; //! The flex connector block for the camera itself's size
+
+module camera_lens(type, offset = 0)
+    color(grey(20))
+        translate(camera_lens_offset(type))
+            for(p = camera_lens(type)) {
+                size = p[0];
+                r = p[1] + offset;
+                app = p[2];
+                if(size.x)
+                    rounded_rectangle(size + [2 * offset, 2 * offset, round_to_layer(offset)], r, center = false);
+                else
+                    translate_z(size.y)
+                        rotate_extrude()
+                            difference() {
+                                square([r, size.z + round_to_layer(offset)]);
+
+                                if(app)
+                                    translate([0, size.z])
+                                        hull() {
+                                            translate([0, -eps])
+                                                square([app.y, eps * 2]);
+
+                                            translate([0, -app.z])
+                                                square([app.x, app.z]);
+                                        }
+                            }
+            }
 
 module camera(type) {           //! Draw specified PCB camera
     vitamin(str("camera(", type[0], "): ", type[1]));
@@ -36,36 +64,14 @@ module camera(type) {           //! Draw specified PCB camera
         pcb(pcb);
 
     translate_z(pcb_thickness(pcb)) {
-        color(grey(20))
-            translate(camera_lens_offset(type))
-                for(p = camera_lens(type)) {
-                    size = p[0];
-                    r = p[1];
-                    app = p[2];
-                    if(size.x)
-                        rounded_rectangle(size, r, center = false);
-                    else
-                        translate_z(size.y)
-                            rotate_extrude()
-                                difference() {
-                                    square([r, size.z]);
+        camera_lens(type);
 
-                                    if(app)
-                                        translate([0, size.z])
-                                            hull() {
-                                                translate([0, -eps])
-                                                    square([app.y, eps * 2]);
-
-                                                translate([0, -app.z])
-                                                    square([app.x, app.z]);
-                                            }
-                                }
-                }
-        conn = camera_connector(type);
+        conn = camera_connector_size(type);
         if(conn) {
+            pos = camera_connector_pos(type);
             color(grey(20))
-                translate(conn[0])
-                    rounded_rectangle(conn[1], 0.5, center = false);
+                translate(pos)
+                    rounded_rectangle(conn, 0.5, center = false);
 
             flex = [5, 0.1];
             color("orange")
@@ -74,8 +80,8 @@ module camera(type) {           //! Draw specified PCB camera
                         translate(camera_lens_offset(type) + [0, camera_lens(type)[0][0].y / 2])
                             cube([flex.x, eps, flex.y], center = true);
 
-                    translate_z(conn[1].z - flex.y)
-                        translate(conn[0] - [0, conn[1].y / 2])
+                    translate_z(conn.z - flex.y)
+                        translate(pos - [0, conn.y / 2])
                              cube([flex.x, eps, flex.y], center = true);
                 }
         }
diff --git a/vitamins/cameras.scad b/vitamins/cameras.scad
index 49ecaf8..d4df234 100644
--- a/vitamins/cameras.scad
+++ b/vitamins/cameras.scad
@@ -22,7 +22,7 @@ rpi_camera_v1_pcb = ["", "",  25, 24, 1, 0, 2.1, 0, "green", false, [[2, -2], [-
     [
         [12,   3.25,  0, "-flat_flex", true],
         [-4.5, -5,    0, "smd_led", LED0603, "red"],
-        [-5.5, -4,    0, "smd_res", RES0603, "10K"],
+        [-5.5, -4,    0, "smd_res", RES0603, "1K2"],
     ],
     []];
 
@@ -32,7 +32,7 @@ rpi_camera_v1 = ["rpi_camera_v1", "Raspberry Pi camera V1", rpi_camera_v1_pcb, [
         [[0, 0, 4], 7.5 / 2],
         [[0, 0, 5], 5.5 / 2, [1.5/2, 2/2, 0.5]],
     ],
-    [[0, 12 - 1.5 - 2.5], [8, 5, 1]]
+    [0, 12 - 1.5 - 2.5], [8, 5, 1]
 ];
 
 rpi_camera_pcb = ["", "",  36, 36, 1.6, 0, 3.2, 0, "green", false, [[3.5, -3.5], [-3.5, -3.5], [3.5, 3.5], [-3.5, 3.5]],
@@ -50,7 +50,7 @@ rpi_camera = ["rpi_camera", "Raspberry Pi focusable camera", rpi_camera_pcb, [0,
         [[0, 0,  12], 6],
         [[0, 11, 4.3], 14 / 2, [8/2, 11/2, 1]],
     ],
-    [[0, 18 - 1.5 - 2.5], [8, 5, 1]]
+    [0, 18 - 1.5 - 2.5], [8, 5, 1.6]
 ];
 
 cameras = [rpi_camera_v1, rpi_camera];