Update app/materials_library.py

app/materials_library.py

@@ -37,7 +37,14 @@ FENESTRATION_TYPES = [
     "Custom"
 ]
 
-# Default library materials
+COLOUR_CATEGORIES = [
+    "Light",      # Absorptivity: 0.30–0.50 (e.g., white paints, aluminium coatings)
+    "Medium",     # Absorptivity: 0.60–0.70 (e.g., beige, tan, concrete)
+    "Dark",       # Absorptivity: 0.85–0.95 (e.g., black surfaces, dark roofs)
+    "Reflective"  # Absorptivity: 0.10–0.20 (e.g., polished metals)
+]
+
+# Default library materials with absorptivity, emissivity, and colour
 DEFAULT_MATERIALS = {
     "Brick": {
         "category": "Structural Materials",
@@ -47,7 +54,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.05, 0.3],
         "default_thickness": 0.1,
         "embodied_carbon": 240.0,  # kg CO2e/m³
-        "cost": 180.0  # USD/m³
+        "cost": 180.0,  # USD/m³
+        "absorptivity": 0.65,  # Medium (reddish-brown brick)
+        "emissivity": 0.90,  # Typical for ceramics
+        "colour": "Medium"
     },
     "Concrete": {
         "category": "Structural Materials",
@@ -57,7 +67,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.05, 0.5],
         "default_thickness": 0.15,
         "embodied_carbon": 320.0,
-        "cost": 120.0
+        "cost": 120.0,
+        "absorptivity": 0.60,  # Medium (grey concrete)
+        "emissivity": 0.88,  # Typical for concrete
+        "colour": "Medium"
     },
     "Gypsum Board": {
         "category": "Finishing Materials",
@@ -67,7 +80,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.01, 0.05],
         "default_thickness": 0.0125,
         "embodied_carbon": 120.0,
-        "cost": 90.0
+        "cost": 90.0,
+        "absorptivity": 0.40,  # Light (white-painted surface)
+        "emissivity": 0.90,  # Typical for painted surfaces
+        "colour": "Light"
     },
     "Mineral Wool": {
         "category": "Insulation",
@@ -77,7 +93,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.025, 0.3],
         "default_thickness": 0.1,
         "embodied_carbon": 45.0,
-        "cost": 70.0
+        "cost": 70.0,
+        "absorptivity": 0.50,  # Light (light-colored insulation)
+        "emissivity": 0.95,  # Typical for fibrous materials
+        "colour": "Light"
     },
     "EPS Insulation": {
         "category": "Insulation",
@@ -87,7 +106,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.025, 0.3],
         "default_thickness": 0.1,
         "embodied_carbon": 88.0,
-        "cost": 65.0
+        "cost": 65.0,
+        "absorptivity": 0.40,  # Light (white foam)
+        "emissivity": 0.92,  # Typical for polymers
+        "colour": "Light"
     },
     "Wood (Pine)": {
         "category": "Structural Materials",
@@ -97,7 +119,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.01, 0.3],
         "default_thickness": 0.05,
         "embodied_carbon": 110.0,
-        "cost": 250.0
+        "cost": 250.0,
+        "absorptivity": 0.65,  # Medium (natural wood)
+        "emissivity": 0.90,  # Typical for wood
+        "colour": "Medium"
     },
     "Steel": {
         "category": "Structural Materials",
@@ -107,7 +132,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.001, 0.05],
         "default_thickness": 0.005,
         "embodied_carbon": 1750.0,
-        "cost": 800.0
+        "cost": 800.0,
+        "absorptivity": 0.15,  # Reflective (polished steel)
+        "emissivity": 0.20,  # Typical for polished metals
+        "colour": "Reflective"
     },
     "Aluminum": {
         "category": "Structural Materials",
@@ -117,7 +145,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.001, 0.05],
         "default_thickness": 0.003,
         "embodied_carbon": 8500.0,
-        "cost": 1200.0
+        "cost": 1200.0,
+        "absorptivity": 0.10,  # Reflective (polished aluminum)
+        "emissivity": 0.05,  # Typical for polished aluminum
+        "colour": "Reflective"
     },
     "Glass Fiber Insulation": {
         "category": "Insulation",
@@ -127,7 +158,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.025, 0.3],
         "default_thickness": 0.1,
         "embodied_carbon": 28.0,
-        "cost": 45.0
+        "cost": 45.0,
+        "absorptivity": 0.50,  # Light (light-colored fibers)
+        "emissivity": 0.95,  # Typical for fibrous materials
+        "colour": "Light"
     },
     "Ceramic Tile": {
         "category": "Finishing Materials",
@@ -137,7 +171,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.005, 0.025],
         "default_thickness": 0.01,
         "embodied_carbon": 650.0,
-        "cost": 280.0
+        "cost": 280.0,
+        "absorptivity": 0.60,  # Medium (neutral-colored tiles)
+        "emissivity": 0.90,  # Typical for ceramics
+        "colour": "Medium"
     },
     "Carpet": {
         "category": "Finishing Materials",
@@ -147,7 +184,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.005, 0.02],
         "default_thickness": 0.01,
         "embodied_carbon": 40.0,
-        "cost": 150.0
+        "cost": 150.0,
+        "absorptivity": 0.70,  # Medium (typical carpet colors)
+        "emissivity": 0.95,  # Typical for fabrics
+        "colour": "Medium"
     },
     "Plywood": {
         "category": "Sub-Structural Materials",
@@ -157,7 +197,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.006, 0.025],
         "default_thickness": 0.012,
         "embodied_carbon": 350.0,
-        "cost": 180.0
+        "cost": 180.0,
+        "absorptivity": 0.65,  # Medium (natural wood)
+        "emissivity": 0.90,  # Typical for wood
+        "colour": "Medium"
     },
     "Concrete Block": {
         "category": "Structural Materials",
@@ -167,7 +210,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.1, 0.3],
         "default_thickness": 0.2,
         "embodied_carbon": 260.0,
-        "cost": 140.0
+        "cost": 140.0,
+        "absorptivity": 0.60,  # Medium (grey blocks)
+        "emissivity": 0.88,  # Typical for concrete
+        "colour": "Medium"
     },
     "Stone (Granite)": {
         "category": "Finishing Materials",
@@ -177,7 +223,10 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.01, 0.1],
         "default_thickness": 0.03,
         "embodied_carbon": 170.0,
-        "cost": 450.0
+        "cost": 450.0,
+        "absorptivity": 0.85,  # Dark (dark stone)
+        "emissivity": 0.90,  # Typical for stone
+        "colour": "Dark"
     },
     "Polyurethane Insulation": {
         "category": "Insulation",
@@ -187,11 +236,14 @@ DEFAULT_MATERIALS = {
         "thickness_range": [0.025, 0.2],
         "default_thickness": 0.075,
         "embodied_carbon": 102.0,
-        "cost": 95.0
+        "cost": 95.0,
+        "absorptivity": 0.40,  # Light (light-colored foam)
+        "emissivity": 0.92,  # Typical for polymers
+        "colour": "Light"
     }
 }
 
-# Default library fenestrations
+# Default library fenestrations with absorptivity and emissivity
 DEFAULT_FENESTRATIONS = {
     "Single Glazing": {
         "type": "Window",
@@ -200,7 +252,10 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.9,
         "thickness": 0.006,
         "embodied_carbon": 800.0,  # kg CO2e/m²
-        "cost": 120.0  # USD/m²
+        "cost": 120.0,  # USD/m²
+        "absorptivity": 0.15,  # Reflective (clear glass)
+        "emissivity": 0.84,  # Typical for glass
+        "colour": "Reflective"
     },
     "Double Glazing (Air)": {
         "type": "Window",
@@ -209,7 +264,10 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.78,
         "thickness": 0.024,
         "embodied_carbon": 950.0,
-        "cost": 180.0
+        "cost": 180.0,
+        "absorptivity": 0.15,  # Reflective
+        "emissivity": 0.84,
+        "colour": "Reflective"
     },
     "Double Glazing (Argon)": {
         "type": "Window",
@@ -218,7 +276,10 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.76,
         "thickness": 0.024,
         "embodied_carbon": 980.0,
-        "cost": 220.0
+        "cost": 220.0,
+        "absorptivity": 0.15,  # Reflective
+        "emissivity": 0.84,
+        "colour": "Reflective"
     },
     "Triple Glazing": {
         "type": "Window",
@@ -227,7 +288,10 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.68,
         "thickness": 0.036,
         "embodied_carbon": 1100.0,
-        "cost": 320.0
+        "cost": 320.0,
+        "absorptivity": 0.15,  # Reflective
+        "emissivity": 0.84,
+        "colour": "Reflective"
     },
     "Low-E Double Glazing": {
         "type": "Window",
@@ -236,7 +300,10 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.74,
         "thickness": 0.024,
         "embodied_carbon": 1050.0,
-        "cost": 250.0
+        "cost": 250.0,
+        "absorptivity": 0.10,  # Reflective (low-E coating)
+        "emissivity": 0.10,  # Typical for low-E glass
+        "colour": "Reflective"
     },
     "Wooden Door": {
         "type": "Door",
@@ -245,7 +312,10 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.0,
         "thickness": 0.04,
         "embodied_carbon": 400.0,
-        "cost": 280.0
+        "cost": 280.0,
+        "absorptivity": 0.65,  # Medium (natural wood)
+        "emissivity": 0.90,
+        "colour": "Medium"
     },
     "Steel Door": {
         "type": "Door",
@@ -254,7 +324,10 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.0,
         "thickness": 0.035,
         "embodied_carbon": 1200.0,
-        "cost": 350.0
+        "cost": 350.0,
+        "absorptivity": 0.15,  # Reflective (polished steel)
+        "emissivity": 0.20,
+        "colour": "Reflective"
     },
     "Glass Door": {
         "type": "Door",
@@ -263,7 +336,10 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.7,
         "thickness": 0.01,
         "embodied_carbon": 900.0,
-        "cost": 420.0
+        "cost": 420.0,
+        "absorptivity": 0.15,  # Reflective
+        "emissivity": 0.84,
+        "colour": "Reflective"
     },
     "Skylight (Double Glazed)": {
         "type": "Skylight",
@@ -272,7 +348,10 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.75,
         "thickness": 0.024,
         "embodied_carbon": 1050.0,
-        "cost": 380.0
+        "cost": 380.0,
+        "absorptivity": 0.15,  # Reflective
+        "emissivity": 0.84,
+        "colour": "Reflective"
     },
     "Skylight (Low-E)": {
         "type": "Skylight",
@@ -281,7 +360,10 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.7,
         "thickness": 0.024,
         "embodied_carbon": 1150.0,
-        "cost": 450.0
+        "cost": 450.0,
+        "absorptivity": 0.10,  # Reflective (low-E coating)
+        "emissivity": 0.10,
+        "colour": "Reflective"
     }
 }
 
@@ -325,46 +407,246 @@ def display_materials_tab():
     # Initialize materials in session state if not present
     initialize_materials()
     
-    # Create columns for library and project materials
-    col1, col2 = st.columns(2)
+    st.subheader("Materials")
+    col1, col2 = st.columns([3, 2])
     
-    # Library Materials
     with col1:
+        # Category filter
+        filter_options = ["All"] + MATERIAL_CATEGORIES
+        category = st.selectbox("Filter by Category", filter_options, key="material_filter")
+        
+        # Library Materials
         st.subheader("Library Materials")
-        display_library_materials()
-    
-    # Project Materials
-    with col2:
+        with st.container():
+            library_materials = st.session_state.project_data["materials"]["library"]
+            filtered_materials = []
+            if category == "All":
+                filtered_materials = list(library_materials.values())
+            else:
+                filtered_materials = [m for m in library_materials.values() if m["category"] == category]
+            
+            if filtered_materials:
+                cols = st.columns([2, 1, 1, 1, 1])
+                cols[0].write("**Name**")
+                cols[1].write("**Thermal Mass (J/kg·K)**")
+                cols[2].write("**U-Value (W/m²·K)**")
+                cols[3].write("**Preview**")
+                cols[4].write("**Copy**")
+                
+                for material in filtered_materials:
+                    cols = st.columns([2, 1, 1, 1, 1])
+                    name = [k for k, v in library_materials.items() if v == material][0]
+                    u_value = material["thermal_conductivity"] / material["default_thickness"]
+                    cols[0].write(name)
+                    cols[1].write(f"{material['specific_heat']:.1f}")
+                    cols[2].write(f"{u_value:.3f}")
+                    if cols[3].button("Preview", key=f"preview_lib_mat_{name}"):
+                        st.session_state.material_editor = {
+                            "name": name,
+                            "category": material["category"],
+                            "thermal_conductivity": material["thermal_conductivity"],
+                            "density": material["density"],
+                            "specific_heat": material["specific_heat"],
+                            "thickness_range": material["thickness_range"],
+                            "default_thickness": material["default_thickness"],
+                            "embodied_carbon": material["embodied_carbon"],
+                            "cost": material["cost"],
+                            "absorptivity": material["absorptivity"],
+                            "emissivity": material["emissivity"],
+                            "colour": material["colour"],
+                            "edit_mode": False,
+                            "original_name": name,
+                            "is_library": True
+                        }
+                        st.session_state.active_tab = "Materials"
+                        st.success(f"Previewing material '{name}'")
+                    if cols[4].button("Copy", key=f"copy_lib_mat_{name}"):
+                        new_name = f"{name}_Project"
+                        counter = 1
+                        while new_name in st.session_state.project_data["materials"]["project"] or new_name in library_materials:
+                            new_name = f"{name}_Project_{counter}"
+                            counter += 1
+                        st.session_state.project_data["materials"]["project"][new_name] = material.copy()
+                        st.success(f"Material '{new_name}' copied to project.")
+                        logger.info(f"Copied library material '{name}' as '{new_name}' to project")
+                        st.rerun()
+            else:
+                st.info("No materials found in the selected category.")
+        
+        # Project Materials
         st.subheader("Project Materials")
-        display_project_materials()
+        with st.container():
+            project_materials = st.session_state.project_data["materials"]["project"]
+            if project_materials:
+                cols = st.columns([2, 1, 1, 1, 1])
+                cols[0].write("**Name**")
+                cols[1].write("**Thermal Mass (J/kg·K)**")
+                cols[2].write("**U-Value (W/m²·K)**")
+                cols[3].write("**Edit**")
+                cols[4].write("**Delete**")
+                
+                for name, material in project_materials.items():
+                    cols = st.columns([2, 1, 1, 1, 1])
+                    u_value = material["thermal_conductivity"] / material["default_thickness"]
+                    cols[0].write(name)
+                    cols[1].write(f"{material['specific_heat']:.1f}")
+                    cols[2].write(f"{u_value:.3f}")
+                    if cols[3].button("Edit", key=f"edit_proj_mat_{name}"):
+                        st.session_state.material_editor = {
+                            "name": name,
+                            "category": material["category"],
+                            "thermal_conductivity": material["thermal_conductivity"],
+                            "density": material["density"],
+                            "specific_heat": material["specific_heat"],
+                            "thickness_range": material["thickness_range"],
+                            "default_thickness": material["default_thickness"],
+                            "embodied_carbon": material["embodied_carbon"],
+                            "cost": material["cost"],
+                            "absorptivity": material["absorptivity"],
+                            "emissivity": material["emissivity"],
+                            "colour": material["colour"],
+                            "edit_mode": True,
+                            "original_name": name,
+                            "is_library": False
+                        }
+                        st.session_state.active_tab = "Materials"
+                        st.success(f"Editing material '{name}'")
+                    if cols[4].button("Delete", key=f"delete_proj_mat_{name}"):
+                        is_in_use = check_material_in_use(name)
+                        if is_in_use:
+                            st.error(f"Cannot delete material '{name}' because it is in use in constructions.")
+                        else:
+                            del st.session_state.project_data["materials"]["project"][name]
+                            st.success(f"Material '{name}' deleted from project.")
+                            logger.info(f"Deleted material '{name}' from project")
+                            st.rerun()
+            else:
+                st.info("No project materials added.")
     
-    # Material Editor
-    st.markdown("---")
-    st.subheader("Material Editor")
-    display_material_editor()
+    with col2:
+        st.subheader("Material Editor/Creator")
+        display_material_editor()
 
 def display_fenestrations_tab():
     """Display the fenestrations tab content."""
     # Initialize fenestrations in session state if not present
     initialize_fenestrations()
     
-    # Create columns for library and project fenestrations
-    col1, col2 = st.columns(2)
+    st.subheader("Fenestrations")
+    col1, col2 = st.columns([3, 2])
     
-    # Library Fenestrations
     with col1:
+        # Type filter
+        filter_options = ["All"] + FENESTRATION_TYPES
+        fen_type = st.selectbox("Filter by Type", filter_options, key="fenestration_filter")
+        
+        # Library Fenestrations
         st.subheader("Library Fenestrations")
-        display_library_fenestrations()
-    
-    # Project Fenestrations
-    with col2:
+        with st.container():
+            library_fenestrations = st.session_state.project_data["fenestrations"]["library"]
+            filtered_fenestrations = []
+            if fen_type == "All":
+                filtered_fenestrations = list(library_fenestrations.values())
+            else:
+                filtered_fenestrations = [f for f in library_fenestrations.values() if f["type"] == fen_type]
+            
+            if filtered_fenestrations:
+                cols = st.columns([2, 1, 1, 1, 1])
+                cols[0].write("**Name**")
+                cols[1].write("**Type**")
+                cols[2].write("**U-Value (W/m²·K)**")
+                cols[3].write("**Preview**")
+                cols[4].write("**Copy**")
+                
+                for fenestration in filtered_fenestrations:
+                    cols = st.columns([2, 1, 1, 1, 1])
+                    name = [k for k, v in library_fenestrations.items() if v == fenestration][0]
+                    cols[0].write(name)
+                    cols[1].write(fenestration["type"])
+                    cols[2].write(f"{fenestration['u_value']:.2f}")
+                    if cols[3].button("Preview", key=f"preview_lib_fen_{name}"):
+                        st.session_state.fenestration_editor = {
+                            "name": name,
+                            "type": fenestration["type"],
+                            "u_value": fenestration["u_value"],
+                            "shgc": fenestration["shgc"],
+                            "visible_transmittance": fenestration["visible_transmittance"],
+                            "thickness": fenestration["thickness"],
+                            "embodied_carbon": fenestration["embodied_carbon"],
+                            "cost": fenestration["cost"],
+                            "absorptivity": fenestration["absorptivity"],
+                            "emissivity": fenestration["emissivity"],
+                            "colour": fenestration["colour"],
+                            "edit_mode": False,
+                            "original_name": name,
+                            "is_library": True
+                        }
+                        st.session_state.active_tab = "Fenestrations"
+                        st.success(f"Previewing fenestration '{name}'")
+                    if cols[4].button("Copy", key=f"copy_lib_fen_{name}"):
+                        new_name = f"{name}_Project"
+                        counter = 1
+                        while new_name in st.session_state.project_data["fenestrations"]["project"] or new_name in library_fenestrations:
+                            new_name = f"{name}_Project_{counter}"
+                            counter += 1
+                        st.session_state.project_data["fenestrations"]["project"][new_name] = fenestration.copy()
+                        st.success(f"Fenestration '{new_name}' copied to project.")
+                        logger.info(f"Copied library fenestration '{name}' as '{new_name}' to project")
+                        st.rerun()
+            else:
+                st.info("No fenestrations found in the selected type.")
+        
+        # Project Fenestrations
         st.subheader("Project Fenestrations")
-        display_project_fenestrations()
+        with st.container():
+            project_fenestrations = st.session_state.project_data["fenestrations"]["project"]
+            if project_fenestrations:
+                cols = st.columns([2, 1, 1, 1, 1])
+                cols[0].write("**Name**")
+                cols[1].write("**Type**")
+                cols[2].write("**U-Value (W/m²·K)**")
+                cols[3].write("**Edit**")
+                cols[4].write("**Delete**")
+                
+                for name, fenestration in project_fenestrations.items():
+                    cols = st.columns([2, 1, 1, 1, 1])
+                    cols[0].write(name)
+                    cols[1].write(fenestration["type"])
+                    cols[2].write(f"{fenestration['u_value']:.2f}")
+                    if cols[3].button("Edit", key=f"edit_proj_fen_{name}"):
+                        st.session_state.fenestration_editor = {
+                            "name": name,
+                            "type": fenestration["type"],
+                            "u_value": fenestration["u_value"],
+                            "shgc": fenestration["shgc"],
+                            "visible_transmittance": fenestration["visible_transmittance"],
+                            "thickness": fenestration["thickness"],
+                            "embodied_carbon": fenestration["embodied_carbon"],
+                            "cost": fenestration["cost"],
+                            "absorptivity": fenestration["absorptivity"],
+                            "emissivity": fenestration["emissivity"],
+                            "colour": fenestration["colour"],
+                            "edit_mode": True,
+                            "original_name": name,
+                            "is_library": False
+                        }
+                        st.session_state.active_tab = "Fenestrations"
+                        st.success(f"Editing fenestration '{name}'")
+                    if cols[4].button("Delete", key=f"delete_proj_fen_{name}"):
+                        is_in_use = check_fenestration_in_use(name)
+                        if is_in_use:
+                            st.error(f"Cannot delete fenestration '{name}' because it is in use in components.")
+                        else:
+                            del st.session_state.project_data["fenestrations"]["project"][name]
+                            st.success(f"Fenestration '{name}' deleted from project.")
+                            logger.info(f"Deleted fenestration '{name}' from project")
+                            st.rerun()
+            else:
+                st.info("No project fenestrations added.")
     
-    # Fenestration Editor
-    st.markdown("---")
-    st.subheader("Fenestration Editor")
-    display_fenestration_editor()
+    with col2:
+        st.subheader("Fenestration Editor/Creator")
+        display_fenestration_editor()
 
 def initialize_materials():
     """Initialize materials in session state if not present."""
@@ -390,8 +672,12 @@ def initialize_materials():
             "default_thickness": 0.05,
             "embodied_carbon": 100.0,
             "cost": 100.0,
+            "absorptivity": 0.60,
+            "emissivity": 0.90,
+            "colour": "Medium",
             "edit_mode": False,
-            "original_name": ""
+            "original_name": "",
+            "is_library": False
         }
 
 def initialize_fenestrations():
@@ -417,144 +703,26 @@ def initialize_fenestrations():
             "thickness": 0.024,
             "embodied_carbon": 900.0,
             "cost": 200.0,
+            "absorptivity": 0.15,
+            "emissivity": 0.84,
+            "colour": "Reflective",
             "edit_mode": False,
-            "original_name": ""
+            "original_name": "",
+            "is_library": False
         }
 
-def display_library_materials():
-    """Display the library materials section."""
-    # Filter options
-    category_filter = st.selectbox(
-        "Filter by Category",
-        ["All"] + MATERIAL_CATEGORIES,
-        key="library_material_category_filter"
-    )
-    
-    # Get library materials
-    library_materials = st.session_state.project_data["materials"]["library"]
-    
-    # Apply filter
-    if category_filter != "All":
-        filtered_materials = {
-            name: props for name, props in library_materials.items()
-            if props["category"] == category_filter
-        }
-    else:
-        filtered_materials = library_materials
-    
-    # Display materials in a table
-    if filtered_materials:
-        # Create a DataFrame for display
-        data = []
-        for name, props in filtered_materials.items():
-            data.append({
-                "Name": name,
-                "Category": props["category"],
-                "Thermal Conductivity (W/m·K)": props["thermal_conductivity"],
-                "Density (kg/m³)": props["density"],
-                "Specific Heat (J/kg·K)": props["specific_heat"]
-            })
-        
-        df = pd.DataFrame(data)
-        st.dataframe(df, use_container_width=True, hide_index=True)
-        
-        # Add to project button
-        selected_material = st.selectbox(
-            "Select Material to Add to Project",
-            list(filtered_materials.keys()),
-            key="library_material_selector"
-        )
-        
-        if st.button("Add to Project", key="add_library_material_to_project"):
-            # Check if material already exists in project
-            if selected_material in st.session_state.project_data["materials"]["project"]:
-                st.warning(f"Material '{selected_material}' already exists in your project.")
-            else:
-                # Add to project materials
-                st.session_state.project_data["materials"]["project"][selected_material] = \
-                    st.session_state.project_data["materials"]["library"][selected_material].copy()
-                st.success(f"Material '{selected_material}' added to your project.")
-                logger.info(f"Added library material '{selected_material}' to project")
-    else:
-        st.info("No materials found in the selected category.")
-
-def display_project_materials():
-    """Display the project materials section."""
-    # Get project materials
-    project_materials = st.session_state.project_data["materials"]["project"]
-    
-    if project_materials:
-        # Create a DataFrame for display
-        data = []
-        for name, props in project_materials.items():
-            data.append({
-                "Name": name,
-                "Category": props["category"],
-                "Thermal Conductivity (W/m·K)": props["thermal_conductivity"],
-                "Density (kg/m³)": props["density"],
-                "Specific Heat (J/kg·K)": props["specific_heat"]
-            })
-        
-        df = pd.DataFrame(data)
-        st.dataframe(df, use_container_width=True, hide_index=True)
-        
-        # Edit and delete options
-        col1, col2 = st.columns(2)
-        
-        with col1:
-            selected_material = st.selectbox(
-                "Select Material to Edit",
-                list(project_materials.keys()),
-                key="project_material_edit_selector"
-            )
-            
-            if st.button("Edit Material", key="edit_project_material"):
-                # Load material data into editor
-                material_data = project_materials[selected_material]
-                st.session_state.material_editor = {
-                    "name": selected_material,
-                    "category": material_data["category"],
-                    "thermal_conductivity": material_data["thermal_conductivity"],
-                    "density": material_data["density"],
-                    "specific_heat": material_data["specific_heat"],
-                    "thickness_range": material_data["thickness_range"],
-                    "default_thickness": material_data["default_thickness"],
-                    "embodied_carbon": material_data["embodied_carbon"],
-                    "cost": material_data["cost"],
-                    "edit_mode": True,
-                    "original_name": selected_material
-                }
-                st.success(f"Material '{selected_material}' loaded for editing.")
-        
-        with col2:
-            selected_material_delete = st.selectbox(
-                "Select Material to Delete",
-                list(project_materials.keys()),
-                key="project_material_delete_selector"
-            )
-            
-            if st.button("Delete Material", key="delete_project_material"):
-                # Check if material is in use
-                is_in_use = check_material_in_use(selected_material_delete)
-                
-                if is_in_use:
-                    st.error(f"Cannot delete material '{selected_material_delete}' because it is in use in constructions.")
-                else:
-                    # Delete material
-                    del st.session_state.project_data["materials"]["project"][selected_material_delete]
-                    st.success(f"Material '{selected_material_delete}' deleted from your project.")
-                    logger.info(f"Deleted material '{selected_material_delete}' from project")
-    else:
-        st.info("No materials in your project. Add materials from the library or create custom materials.")
-
 def display_material_editor():
     """Display the material editor form."""
     with st.form("material_editor_form"):
+        editor_state = st.session_state.material_editor
+        is_library = editor_state.get("is_library", False)
+        
         # Material name
         name = st.text_input(
             "Material Name",
-            value=st.session_state.material_editor["name"],
-            help="Enter a unique name for the material."
+            value=editor_state["name"],
+            help="Enter a unique name for the material.",
+            disabled=is_library
         )
         
         # Create two columns for layout
@@ -565,8 +733,9 @@ def display_material_editor():
             category = st.selectbox(
                 "Category",
                 MATERIAL_CATEGORIES,
-                index=MATERIAL_CATEGORIES.index(st.session_state.material_editor["category"]) if st.session_state.material_editor["category"] in MATERIAL_CATEGORIES else 0,
-                help="Select the material category."
+                index=MATERIAL_CATEGORIES.index(editor_state["category"]) if editor_state["category"] in MATERIAL_CATEGORIES else 0,
+                help="Select the material category.",
+                disabled=is_library
             )
             
             # Thermal conductivity
@@ -574,9 +743,10 @@ def display_material_editor():
                 "Thermal Conductivity (W/m·K)",
                 min_value=0.001,
                 max_value=1000.0,
-                value=float(st.session_state.material_editor["thermal_conductivity"]),
+                value=float(editor_state["thermal_conductivity"]),
                 format="%.3f",
-                help="Thermal conductivity in W/m·K. Lower values indicate better insulation."
+                help="Thermal conductivity in W/m·K. Lower values indicate better insulation.",
+                disabled=is_library
             )
             
             # Density
@@ -584,9 +754,10 @@ def display_material_editor():
                 "Density (kg/m³)",
                 min_value=1.0,
                 max_value=20000.0,
-                value=float(st.session_state.material_editor["density"]),
+                value=float(editor_state["density"]),
                 format="%.1f",
-                help="Material density in kg/m³."
+                help="Material density in kg/m³.",
+                disabled=is_library
             )
         
         with col2:
@@ -595,20 +766,22 @@ def display_material_editor():
                 "Specific Heat (J/kg·K)",
                 min_value=100.0,
                 max_value=10000.0,
-                value=float(st.session_state.material_editor["specific_heat"]),
+                value=float(editor_state["specific_heat"]),
                 format="%.1f",
-                help="Specific heat capacity in J/kg·K. Higher values indicate better thermal mass."
+                help="Specific heat capacity in J/kg·K. Higher values indicate better thermal mass.",
+                disabled=is_library
             )
             
             # Thickness range
-            min_thickness, max_thickness = st.session_state.material_editor["thickness_range"]
+            min_thickness, max_thickness = editor_state["thickness_range"]
             thickness_range = st.slider(
                 "Thickness Range (m)",
                 min_value=0.001,
                 max_value=0.5,
                 value=(float(min_thickness), float(max_thickness)),
                 format="%.3f",
-                help="Minimum and maximum thickness range for this material in meters."
+                help="Minimum and maximum thickness range for this material in meters.",
+                disabled=is_library
             )
             
             # Default thickness
@@ -616,12 +789,13 @@ def display_material_editor():
                 "Default Thickness (m)",
                 min_value=float(thickness_range[0]),
                 max_value=float(thickness_range[1]),
-                value=min(max(float(st.session_state.material_editor["default_thickness"]), float(thickness_range[0])), float(thickness_range[1])),
+                value=min(max(float(editor_state["default_thickness"]), float(thickness_range[0])), float(thickness_range[1])),
                 format="%.3f",
-                help="Default thickness for this material in meters."
+                help="Default thickness for this material in meters.",
+                disabled=is_library
             )
         
-        # Additional properties for embodied carbon and cost
+        # Additional properties
         st.subheader("Additional Properties")
         col1, col2 = st.columns(2)
         
@@ -631,9 +805,21 @@ def display_material_editor():
                 "Embodied Carbon (kg CO₂e/m³)",
                 min_value=0.0,
                 max_value=10000.0,
-                value=float(st.session_state.material_editor["embodied_carbon"]),
+                value=float(editor_state["embodied_carbon"]),
                 format="%.1f",
-                help="Embodied carbon in kg CO₂e per cubic meter."
+                help="Embodied carbon in kg CO₂e per cubic meter.",
+                disabled=is_library
+            )
+            
+            # Absorptivity
+            absorptivity = st.number_input(
+                "Absorptivity",
+                min_value=0.0,
+                max_value=1.0,
+                value=float(editor_state["absorptivity"]),
+                format="%.2f",
+                help="Solar radiation absorbed (0-1).",
+                disabled=is_library
             )
         
         with col2:
@@ -642,31 +828,52 @@ def display_material_editor():
                 "Cost (USD/m³)",
                 min_value=0.0,
                 max_value=10000.0,
-                value=float(st.session_state.material_editor["cost"]),
+                value=float(editor_state["cost"]),
                 format="%.1f",
-                help="Material cost in USD per cubic meter."
+                help="Material cost in USD per cubic meter.",
+                disabled=is_library
             )
+            
+            # Emissivity
+            emissivity = st.number_input(
+                "Emissivity",
+                min_value=0.0,
+                max_value=1.0,
+                value=float(editor_state["emissivity"]),
+                format="%.2f",
+                help="Ratio of radiation emitted (0-1).",
+                disabled=is_library
+            )
+        
+        # Colour
+        colour = st.selectbox(
+            "Colour Category",
+            COLOUR_CATEGORIES,
+            index=COLOUR_CATEGORIES.index(editor_state["colour"]) if editor_state["colour"] in COLOUR_CATEGORIES else 0,
+            help="Colour category affecting absorptivity.",
+            disabled=is_library
+        )
         
         # Form submission buttons
         col1, col2 = st.columns(2)
         
         with col1:
-            submit_button = st.form_submit_button("Save Material")
+            submit_button = st.form_submit_button("Save Material", disabled=is_library)
         
         with col2:
             clear_button = st.form_submit_button("Clear Form")
     
     # Handle form submission
-    if submit_button:
+    if submit_button and not is_library:
         # Validate inputs
         validation_errors = validate_material(
             name, category, thermal_conductivity, density, specific_heat,
             thickness_range, default_thickness, embodied_carbon, cost,
-            st.session_state.material_editor["edit_mode"], st.session_state.material_editor["original_name"]
+            editor_state["edit_mode"], editor_state["original_name"],
+            absorptivity, emissivity, colour
         )
         
         if validation_errors:
-            # Display validation errors
             for error in validation_errors:
                 st.error(error)
         else:
@@ -679,168 +886,46 @@ def display_material_editor():
                 "thickness_range": list(thickness_range),
                 "default_thickness": default_thickness,
                 "embodied_carbon": embodied_carbon,
-                "cost": cost
+                "cost": cost,
+                "absorptivity": absorptivity,
+                "emissivity": emissivity,
+                "colour": colour
             }
             
             # Handle edit mode
-            if st.session_state.material_editor["edit_mode"]:
-                original_name = st.session_state.material_editor["original_name"]
-                
-                # If name changed, delete old entry and create new one
+            if editor_state["edit_mode"]:
+                original_name = editor_state["original_name"]
                 if original_name != name:
                     del st.session_state.project_data["materials"]["project"][original_name]
-                
-                # Update material
                 st.session_state.project_data["materials"]["project"][name] = material_data
                 st.success(f"Material '{name}' updated successfully.")
                 logger.info(f"Updated material '{name}' in project")
             else:
-                # Add new material
                 st.session_state.project_data["materials"]["project"][name] = material_data
                 st.success(f"Material '{name}' added to your project.")
                 logger.info(f"Added new material '{name}' to project")
             
             # Reset editor
             reset_material_editor()
+            st.rerun()
     
     # Handle clear button
     if clear_button:
         reset_material_editor()
         st.rerun()
 
-def display_library_fenestrations():
-    """Display the library fenestrations section."""
-    # Filter options
-    type_filter = st.selectbox(
-        "Filter by Type",
-        ["All"] + FENESTRATION_TYPES,
-        key="library_fenestration_type_filter"
-    )
-    
-    # Get library fenestrations
-    library_fenestrations = st.session_state.project_data["fenestrations"]["library"]
-    
-    # Apply filter
-    if type_filter != "All":
-        filtered_fenestrations = {
-            name: props for name, props in library_fenestrations.items()
-            if props["type"] == type_filter
-        }
-    else:
-        filtered_fenestrations = library_fenestrations
-    
-    # Display fenestrations in a table
-    if filtered_fenestrations:
-        # Create a DataFrame for display
-        data = []
-        for name, props in filtered_fenestrations.items():
-            data.append({
-                "Name": name,
-                "Type": props["type"],
-                "U-Value (W/m²·K)": props["u_value"],
-                "SHGC": props["shgc"],
-                "Visible Transmittance": props["visible_transmittance"]
-            })
-        
-        df = pd.DataFrame(data)
-        st.dataframe(df, use_container_width=True, hide_index=True)
-        
-        # Add to project button
-        selected_fenestration = st.selectbox(
-            "Select Fenestration to Add to Project",
-            list(filtered_fenestrations.keys()),
-            key="library_fenestration_selector"
-        )
-        
-        if st.button("Add to Project", key="add_library_fenestration_to_project"):
-            # Check if fenestration already exists in project
-            if selected_fenestration in st.session_state.project_data["fenestrations"]["project"]:
-                st.warning(f"Fenestration '{selected_fenestration}' already exists in your project.")
-            else:
-                # Add to project fenestrations
-                st.session_state.project_data["fenestrations"]["project"][selected_fenestration] = \
-                    st.session_state.project_data["fenestrations"]["library"][selected_fenestration].copy()
-                st.success(f"Fenestration '{selected_fenestration}' added to your project.")
-                logger.info(f"Added library fenestration '{selected_fenestration}' to project")
-    else:
-        st.info("No fenestrations found in the selected type.")
-
-def display_project_fenestrations():
-    """Display the project fenestrations section."""
-    # Get project fenestrations
-    project_fenestrations = st.session_state.project_data["fenestrations"]["project"]
-    
-    if project_fenestrations:
-        # Create a DataFrame for display
-        data = []
-        for name, props in project_fenestrations.items():
-            data.append({
-                "Name": name,
-                "Type": props["type"],
-                "U-Value (W/m²·K)": props["u_value"],
-                "SHGC": props["shgc"],
-                "Visible Transmittance": props["visible_transmittance"]
-            })
-        
-        df = pd.DataFrame(data)
-        st.dataframe(df, use_container_width=True, hide_index=True)
-        
-        # Edit and delete options
-        col1, col2 = st.columns(2)
-        
-        with col1:
-            selected_fenestration = st.selectbox(
-                "Select Fenestration to Edit",
-                list(project_fenestrations.keys()),
-                key="project_fenestration_edit_selector"
-            )
-            
-            if st.button("Edit Fenestration", key="edit_project_fenestration"):
-                # Load fenestration data into editor
-                fenestration_data = project_fenestrations[selected_fenestration]
-                st.session_state.fenestration_editor = {
-                    "name": selected_fenestration,
-                    "type": fenestration_data["type"],
-                    "u_value": fenestration_data["u_value"],
-                    "shgc": fenestration_data["shgc"],
-                    "visible_transmittance": fenestration_data["visible_transmittance"],
-                    "thickness": fenestration_data["thickness"],
-                    "embodied_carbon": fenestration_data["embodied_carbon"],
-                    "cost": fenestration_data["cost"],
-                    "edit_mode": True,
-                    "original_name": selected_fenestration
-                }
-                st.success(f"Fenestration '{selected_fenestration}' loaded for editing.")
-        
-        with col2:
-            selected_fenestration_delete = st.selectbox(
-                "Select Fenestration to Delete",
-                list(project_fenestrations.keys()),
-                key="project_fenestration_delete_selector"
-            )
-            
-            if st.button("Delete Fenestration", key="delete_project_fenestration"):
-                # Check if fenestration is in use
-                is_in_use = check_fenestration_in_use(selected_fenestration_delete)
-                
-                if is_in_use:
-                    st.error(f"Cannot delete fenestration '{selected_fenestration_delete}' because it is in use in components.")
-                else:
-                    # Delete fenestration
-                    del st.session_state.project_data["fenestrations"]["project"][selected_fenestration_delete]
-                    st.success(f"Fenestration '{selected_fenestration_delete}' deleted from your project.")
-                    logger.info(f"Deleted fenestration '{selected_fenestration_delete}' from project")
-    else:
-        st.info("No fenestrations in your project. Add fenestrations from the library or create custom fenestrations.")
-
 def display_fenestration_editor():
     """Display the fenestration editor form."""
     with st.form("fenestration_editor_form"):
+        editor_state = st.session_state.fenestration_editor
+        is_library = editor_state.get("is_library", False)
+        
         # Fenestration name
         name = st.text_input(
             "Fenestration Name",
-            value=st.session_state.fenestration_editor["name"],
-            help="Enter a unique name for the fenestration."
+            value=editor_state["name"],
+            help="Enter a unique name for the fenestration.",
+            disabled=is_library
         )
         
         # Create two columns for layout
@@ -851,8 +936,9 @@ def display_fenestration_editor():
             fenestration_type = st.selectbox(
                 "Type",
                 FENESTRATION_TYPES,
-                index=FENESTRATION_TYPES.index(st.session_state.fenestration_editor["type"]) if st.session_state.fenestration_editor["type"] in FENESTRATION_TYPES else 0,
-                help="Select the fenestration type."
+                index=FENESTRATION_TYPES.index(editor_state["type"]) if editor_state["type"] in FENESTRATION_TYPES else 0,
+                help="Select the fenestration type.",
+                disabled=is_library
             )
             
             # U-value
@@ -860,9 +946,10 @@ def display_fenestration_editor():
                 "U-Value (W/m²·K)",
                 min_value=0.1,
                 max_value=10.0,
-                value=float(st.session_state.fenestration_editor["u_value"]),
+                value=float(editor_state["u_value"]),
                 format="%.2f",
-                help="U-value in W/m²·K. Lower values indicate better insulation."
+                help="U-value in W/m²·K. Lower values indicate better insulation.",
+                disabled=is_library
             )
             
             # SHGC
@@ -870,9 +957,10 @@ def display_fenestration_editor():
                 "Solar Heat Gain Coefficient (SHGC)",
                 min_value=0.0,
                 max_value=1.0,
-                value=float(st.session_state.fenestration_editor["shgc"]),
+                value=float(editor_state["shgc"]),
                 format="%.2f",
-                help="Solar Heat Gain Coefficient (0-1). Lower values indicate less solar heat transmission."
+                help="Solar Heat Gain Coefficient (0-1). Lower values indicate less solar heat transmission.",
+                disabled=is_library
             )
         
         with col2:
@@ -881,9 +969,10 @@ def display_fenestration_editor():
                 "Visible Transmittance",
                 min_value=0.0,
                 max_value=1.0,
-                value=float(st.session_state.fenestration_editor["visible_transmittance"]),
+                value=float(editor_state["visible_transmittance"]),
                 format="%.2f",
-                help="Visible Transmittance (0-1). Higher values indicate more visible light transmission."
+                help="Visible Transmittance (0-1). Higher values indicate more visible light transmission.",
+                disabled=is_library
             )
             
             # Thickness
@@ -891,12 +980,13 @@ def display_fenestration_editor():
                 "Thickness (m)",
                 min_value=0.001,
                 max_value=0.1,
-                value=float(st.session_state.fenestration_editor["thickness"]),
+                value=float(editor_state["thickness"]),
                 format="%.3f",
-                help="Thickness in meters."
+                help="Thickness in meters.",
+                disabled=is_library
             )
         
-        # Additional properties for embodied carbon and cost
+        # Additional properties
         st.subheader("Additional Properties")
         col1, col2 = st.columns(2)
         
@@ -906,9 +996,21 @@ def display_fenestration_editor():
                 "Embodied Carbon (kg CO₂e/m²)",
                 min_value=0.0,
                 max_value=5000.0,
-                value=float(st.session_state.fenestration_editor["embodied_carbon"]),
+                value=float(editor_state["embodied_carbon"]),
                 format="%.1f",
-                help="Embodied carbon in kg CO₂e per square meter."
+                help="Embodied carbon in kg CO₂e per square meter.",
+                disabled=is_library
+            )
+            
+            # Absorptivity
+            absorptivity = st.number_input(
+                "Absorptivity",
+                min_value=0.0,
+                max_value=1.0,
+                value=float(editor_state["absorptivity"]),
+                format="%.2f",
+                help="Solar radiation absorbed (0-1).",
+                disabled=is_library
             )
         
         with col2:
@@ -917,31 +1019,51 @@ def display_fenestration_editor():
                 "Cost (USD/m²)",
                 min_value=0.0,
                 max_value=5000.0,
-                value=float(st.session_state.fenestration_editor["cost"]),
+                value=float(editor_state["cost"]),
                 format="%.1f",
-                help="Fenestration cost in USD per square meter."
+                help="Fenestration cost in USD per square meter.",
+                disabled=is_library
+            )
+            
+            # Emissivity
+            emissivity = st.number_input(
+                "Emissivity",
+                min_value=0.0,
+                max_value=1.0,
+                value=float(editor_state["emissivity"]),
+                format="%.2f",
+                help="Ratio of radiation emitted (0-1).",
+                disabled=is_library
             )
         
+        # Colour
+        colour = st.selectbox(
+            "Colour Category",
+            COLOUR_CATEGORIES,
+            index=COLOUR_CATEGORIES.index(editor_state["colour"]) if editor_state["colour"] in COLOUR_CATEGORIES else 0,
+            help="Colour category affecting absorptivity.",
+            disabled=is_library
+        )
+        
         # Form submission buttons
         col1, col2 = st.columns(2)
         
         with col1:
-            submit_button = st.form_submit_button("Save Fenestration")
+            submit_button = st.form_submit_button("Save Fenestration", disabled=is_library)
         
         with col2:
             clear_button = st.form_submit_button("Clear Form")
     
     # Handle form submission
-    if submit_button:
+    if submit_button and not is_library:
         # Validate inputs
         validation_errors = validate_fenestration(
             name, fenestration_type, u_value, shgc, visible_transmittance, thickness,
-            embodied_carbon, cost, st.session_state.fenestration_editor["edit_mode"],
-            st.session_state.fenestration_editor["original_name"]
+            embodied_carbon, cost, editor_state["edit_mode"], editor_state["original_name"],
+            absorptivity, emissivity, colour
         )
         
         if validation_errors:
-            # Display validation errors
             for error in validation_errors:
                 st.error(error)
         else:
@@ -953,29 +1075,28 @@ def display_fenestration_editor():
                 "visible_transmittance": visible_transmittance,
                 "thickness": thickness,
                 "embodied_carbon": embodied_carbon,
-                "cost": cost
+                "cost": cost,
+                "absorptivity": absorptivity,
+                "emissivity": emissivity,
+                "colour": colour
             }
             
             # Handle edit mode
-            if st.session_state.fenestration_editor["edit_mode"]:
-                original_name = st.session_state.fenestration_editor["original_name"]
-                
-                # If name changed, delete old entry and create new one
+            if editor_state["edit_mode"]:
+                original_name = editor_state["original_name"]
                 if original_name != name:
                     del st.session_state.project_data["fenestrations"]["project"][original_name]
-                
-                # Update fenestration
                 st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
                 st.success(f"Fenestration '{name}' updated successfully.")
                 logger.info(f"Updated fenestration '{name}' in project")
             else:
-                # Add new fenestration
                 st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
                 st.success(f"Fenestration '{name}' added to your project.")
                 logger.info(f"Added new fenestration '{name}' to project")
             
             # Reset editor
             reset_fenestration_editor()
+            st.rerun()
     
     # Handle clear button
     if clear_button:
@@ -985,26 +1106,11 @@ def display_fenestration_editor():
 def validate_material(
     name: str, category: str, thermal_conductivity: float, density: float,
     specific_heat: float, thickness_range: Tuple[float, float], default_thickness: float,
-    embodied_carbon: float, cost: float, edit_mode: bool, original_name: str
+    embodied_carbon: float, cost: float, edit_mode: bool, original_name: str,
+    absorptivity: float, emissivity: float, colour: str
 ) -> List[str]:
     """
     Validate material inputs.
-    
-    Args:
-        name: Material name
-        category: Material category
-        thermal_conductivity: Thermal conductivity in W/m·K
-        density: Density in kg/m³
-        specific_heat: Specific heat in J/kg·K
-        thickness_range: Tuple of (min_thickness, max_thickness) in meters
-        default_thickness: Default thickness in meters
-        embodied_carbon: Embodied carbon in kg CO₂e/m³
-        cost: Cost in USD/m³
-        edit_mode: Whether in edit mode
-        original_name: Original name if in edit mode
-        
-    Returns:
-        List of validation error messages, empty if all inputs are valid
     """
     errors = []
     
@@ -1012,7 +1118,7 @@ def validate_material(
     if not name or name.strip() == "":
         errors.append("Material name is required.")
     
-    # Check for name uniqueness if not in edit mode or if name changed
+    # Check for name uniqueness
     if not edit_mode or (edit_mode and name != original_name):
         if name in st.session_state.project_data["materials"]["project"]:
             errors.append(f"Material name '{name}' already exists in your project.")
@@ -1051,30 +1157,39 @@ def validate_material(
     if cost < 0:
         errors.append("Cost cannot be negative.")
     
+    # Validate absorptivity
+    if absorptivity < 0 or absorptivity > 1:
+        errors.append("Absorptivity must be between 0 and 1.")
+    
+    # Validate emissivity
+    if emissivity < 0 or emissivity > 1:
+        errors.append("Emissivity must be between 0 and 1.")
+    
+    # Validate colour
+    if colour not in COLOUR_CATEGORIES:
+        errors.append("Please select a valid colour category.")
+    
+    # Validate absorptivity based on colour
+    colour_ranges = {
+        "Light": (0.30, 0.50),
+        "Medium": (0.60, 0.70),
+        "Dark": (0.85, 0.95),
+        "Reflective": (0.10, 0.20)
+    }
+    min_abs, max_abs = colour_ranges[colour]
+    if not (min_abs <= absorptivity <= max_abs):
+        errors.append(f"Absorptivity for {colour} colour must be between {min_abs} and {max_abs}.")
+    
     return errors
 
 def validate_fenestration(
     name: str, fenestration_type: str, u_value: float, shgc: float,
     visible_transmittance: float, thickness: float, embodied_carbon: float,
-    cost: float, edit_mode: bool, original_name: str
+    cost: float, edit_mode: bool, original_name: str,
+    absorptivity: float, emissivity: float, colour: str
 ) -> List[str]:
     """
     Validate fenestration inputs.
-    
-    Args:
-        name: Fenestration name
-        fenestration_type: Fenestration type
-        u_value: U-value in W/m²·K
-        shgc: Solar Heat Gain Coefficient (0-1)
-        visible_transmittance: Visible Transmittance (0-1)
-        thickness: Thickness in meters
-        embodied_carbon: Embodied carbon in kg CO₂e/m²
-        cost: Cost in USD/m²
-        edit_mode: Whether in edit mode
-        original_name: Original name if in edit mode
-        
-    Returns:
-        List of validation error messages, empty if all inputs are valid
     """
     errors = []
     
@@ -1082,7 +1197,7 @@ def validate_fenestration(
     if not name or name.strip() == "":
         errors.append("Fenestration name is required.")
     
-    # Check for name uniqueness if not in edit mode or if name changed
+    # Check for name uniqueness
     if not edit_mode or (edit_mode and name != original_name):
         if name in st.session_state.project_data["fenestrations"]["project"]:
             errors.append(f"Fenestration name '{name}' already exists in your project.")
@@ -1115,6 +1230,29 @@ def validate_fenestration(
     if cost < 0:
         errors.append("Cost cannot be negative.")
     
+    # Validate absorptivity
+    if absorptivity < 0 or absorptivity > 1:
+        errors.append("Absorptivity must be between 0 and 1.")
+    
+    # Validate emissivity
+    if emissivity < 0 or emissivity > 1:
+        errors.append("Emissivity must be between 0 and 1.")
+    
+    # Validate colour
+    if colour not in COLOUR_CATEGORIES:
+        errors.append("Please select a valid colour category.")
+    
+    # Validate absorptivity based on colour
+    colour_ranges = {
+        "Light": (0.30, 0.50),
+        "Medium": (0.60, 0.70),
+        "Dark": (0.85, 0.95),
+        "Reflective": (0.10, 0.20)
+    }
+    min_abs, max_abs = colour_ranges[colour]
+    if not (min_abs <= absorptivity <= max_abs):
+        errors.append(f"Absorptivity for {colour} colour must be between {min_abs} and {max_abs}.")
+    
     return errors
 
 def reset_material_editor():
@@ -1129,8 +1267,12 @@ def reset_material_editor():
         "default_thickness": 0.05,
         "embodied_carbon": 100.0,
         "cost": 100.0,
+        "absorptivity": 0.60,
+        "emissivity": 0.90,
+        "colour": "Medium",
         "edit_mode": False,
-        "original_name": ""
+        "original_name": "",
+        "is_library": False
     }
 
 def reset_fenestration_editor():
@@ -1144,36 +1286,24 @@ def reset_fenestration_editor():
         "thickness": 0.024,
         "embodied_carbon": 900.0,
         "cost": 200.0,
+        "absorptivity": 0.15,
+        "emissivity": 0.84,
+        "colour": "Reflective",
         "edit_mode": False,
-        "original_name": ""
+        "original_name": "",
+        "is_library": False
     }
 
 def check_material_in_use(material_name: str) -> bool:
     """
     Check if a material is in use in any constructions.
-    
-    Args:
-        material_name: Name of the material to check
-        
-    Returns:
-        True if the material is in use, False otherwise
     """
-    # This is a placeholder function that will be implemented when constructions are added
-    # For now, we'll assume materials are not in use
     return False
 
 def check_fenestration_in_use(fenestration_name: str) -> bool:
     """
     Check if a fenestration is in use in any components.
-    
-    Args:
-        fenestration_name: Name of the fenestration to check
-        
-    Returns:
-        True if the fenestration is in use, False otherwise
     """
-    # This is a placeholder function that will be implemented when components are added
-    # For now, we'll assume fenestrations are not in use
     return False
 
 def display_materials_help():
@@ -1185,15 +1315,15 @@ def display_materials_help():
     
     **Materials Tab:**
     
-    * **Library Materials**: Pre-defined materials with standard thermal properties.
-    * **Project Materials**: Materials you've added to your project from the library or created custom.
-    * **Material Editor**: Create new materials or edit existing ones in your project.
+    * **Library Materials**: Pre-defined materials with standard thermal properties. Use 'Preview' to view details or 'Copy' to add to your project.
+    * **Project Materials**: Materials you've added to your project. Use 'Edit' to modify or 'Delete' to remove.
+    * **Material Editor/Creator**: Create new materials or edit existing project materials. Library materials can only be previewed.
     
     **Fenestrations Tab:**
     
-    * **Library Fenestrations**: Pre-defined windows, doors, and skylights with standard thermal properties.
-    * **Project Fenestrations**: Fenestrations you've added to your project from the library or created custom.
-    * **Fenestration Editor**: Create new fenestrations or edit existing ones in your project.
+    * **Library Fenestrations**: Pre-defined windows, doors, and skylights. Use 'Preview' to view details or 'Copy' to add to your project.
+    * **Project Fenestrations**: Fenestrations you've added to your project. Use 'Edit' to modify or 'Delete' to remove.
+    * **Fenestration Editor/Creator**: Create new fenestrations or edit existing project fenestrations. Library fenestrations can only be previewed.
     
     **Key Properties:**
     
@@ -1205,11 +1335,14 @@ def display_materials_help():
     * **Visible Transmittance**: Fraction of visible light that passes through a fenestration.
     * **Embodied Carbon**: Carbon emissions associated with material production, measured in kg CO₂e per unit volume or area.
     * **Cost**: Material cost in USD per unit volume or area.
+    * **Absorptivity**: Fraction of solar radiation absorbed (0-1). Depends on colour category.
+    * **Emissivity**: Ratio of radiation emitted by the material (0-1).
+    * **Colour**: Category affecting absorptivity (Light, Medium, Dark, Reflective).
     
     **Workflow:**
     
     1. Browse the library materials and fenestrations
-    2. Add items to your project or create custom ones
+    2. Copy items to your project or create custom ones
     3. Edit properties as needed for your specific project
     4. Continue to the Construction page to create assemblies using these materials
-    """)
+    """)